Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[x] Ship Console Refactor | [ ] Ship Modules / Machinery #434

Closed
wants to merge 43 commits into from
Closed

[x] Ship Console Refactor | [ ] Ship Modules / Machinery #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
cbe6b08
create special subtype for ship consoles
ZephyrTFA Nov 15, 2021
c390a43
Merge remote-tracking branch 'upstream/master' into outpostorio
ZephyrTFA Nov 15, 2021
43926f9
add inline bluespace jump handling
ZephyrTFA Nov 15, 2021
2d1e1d4
update helm for the new ship console format
ZephyrTFA Nov 15, 2021
775724e
you probably want to be able to use the bluespace jump console while …
ZephyrTFA Nov 15, 2021
f65f4c4
missed a few maps
ZephyrTFA Nov 15, 2021
a692dc3
a
ZephyrTFA Nov 15, 2021
3d22ef2
module handles structure creation now
ZephyrTFA Nov 16, 2021
2a0f9f0
oops
ZephyrTFA Nov 16, 2021
5d89677
support virtual ship thrusts
ZephyrTFA Nov 20, 2021
61ad748
damage types for ships
ZephyrTFA Nov 20, 2021
ea5ba6b
ship signals for module interactions
ZephyrTFA Nov 20, 2021
995dbe8
change module generation
ZephyrTFA Nov 21, 2021
de9944b
the structure handles these by default
ZephyrTFA Nov 21, 2021
0555de0
energy shield
ZephyrTFA Nov 21, 2021
928c05a
fix my shitcode and add a helper macro for damage
ZephyrTFA Nov 21, 2021
cb83fb3
oops
ZephyrTFA Nov 21, 2021
e2d772e
base icon states
ZephyrTFA Nov 21, 2021
96eeec1
Merge remote-tracking branch 'upstream/master' into outpostorio
ZephyrTFA Nov 21, 2021
14545f3
helper proc
ZephyrTFA Nov 23, 2021
4dc8945
beginnings of weapons
ZephyrTFA Nov 23, 2021
51a0687
a
ZephyrTFA Nov 23, 2021
ada4d7f
use correct vat
ZephyrTFA Nov 27, 2021
c6f7dbf
Merge remote-tracking branch 'upstream/master' into outpostorio
ZephyrTFA Nov 27, 2021
03d4571
update shuttle creator
ZephyrTFA Nov 27, 2021
10f2bd3
actually support multiple structures correctly
ZephyrTFA Nov 28, 2021
bd9ddb0
amend last
ZephyrTFA Nov 28, 2021
7257db9
refactor and helper proc for getting module by id
ZephyrTFA Nov 28, 2021
b1d2885
i dont want to stash so I'm commiting everything
ZephyrTFA Nov 30, 2021
0faeeca
Merge remote-tracking branch 'upstream/master' into outpostorio
ZephyrTFA Dec 2, 2021
2369591
define documentation
ZephyrTFA Dec 2, 2021
60ab553
check with the structure if we are allowed to fire
ZephyrTFA Dec 2, 2021
d1e5618
I literally just added the proc and still forgot the vars it takes
ZephyrTFA Dec 2, 2021
6557b5c
ammo usage and insertion
ZephyrTFA Dec 2, 2021
6ed81ad
use qdel_null instead of normal qdel
ZephyrTFA Dec 2, 2021
6f439f8
flak cannon
ZephyrTFA Dec 2, 2021
8ea430b
emp and missile launcher fragments
ZephyrTFA Dec 5, 2021
0a354f5
add todos on things todo
ZephyrTFA Dec 5, 2021
ef02a59
module install defines and helper
ZephyrTFA Dec 7, 2021
3270085
overhaul can_install
ZephyrTFA Dec 7, 2021
49485da
empty file so DM stops yelling at me
ZephyrTFA Dec 14, 2021
703218f
module builder start
ZephyrTFA Dec 14, 2021
bdda335
add material costs
ZephyrTFA Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5635,7 +5635,7 @@
dir = 4
},
/obj/structure/rack,
/obj/item/circuitboard/computer/shuttle/helm,
/obj/item/circuitboard/computer/ship/helm,
/obj/item/circuitboard/machine/shuttle/engine/electric,
/obj/item/circuitboard/machine/shuttle/engine/electric,
/obj/item/circuitboard/machine/shuttle/engine/plasma,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
/area/lavaland/surface/outdoors)
"D" = (
/obj/structure/frame/computer,
/obj/item/circuitboard/computer/shuttle/helm,
/obj/item/circuitboard/computer/ship/helm,
/obj/item/shard,
/turf/open/floor/mineral/titanium/blue,
/area/lavaland/surface/outdoors)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2390,7 +2390,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/powered/golem_ship)
"ZY" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1911,7 +1911,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered/syndicate_lava_base/cargo)
"hp" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_solgovcrash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
/area/ruin/unpowered)
"t" = (
/obj/structure/frame/computer,
/obj/item/circuitboard/computer/shuttle/helm,
/obj/item/circuitboard/computer/ship/helm,
/turf/open/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"v" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/astraeus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
dir = 6
},
/obj/effect/decal/cleanable/glass,
/obj/item/circuitboard/computer/shuttle/helm,
/obj/item/circuitboard/computer/ship/helm,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/space/has_grav/astraeus/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/mechtransport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav/powered/mechtransport)
"j" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2810,7 +2810,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/moonoutpost19/arrivals)
"mG" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomZLevels/snowdin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7091,7 +7091,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8;
name = "Excavation Elevator Console"
},
Expand Down Expand Up @@ -9820,7 +9820,7 @@
},
/area/awaymission/snowdin/post/mining_main/mechbay)
"KS" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/obj/effect/turf_decal/industrial/warning{
Expand Down Expand Up @@ -13469,7 +13469,7 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/mining_main)
"TJ" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/obj/effect/turf_decal/industrial/warning{
Expand Down Expand Up @@ -14863,7 +14863,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8;
name = "Excavation Elevator Console"
},
Expand Down
16 changes: 8 additions & 8 deletions _maps/RandomZLevels/spacebattle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate3)
"aK" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 1
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -295,7 +295,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bu" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 1
},
/turf/open/floor/mineral/plastitanium/red,
Expand All @@ -318,7 +318,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate2)
"bC" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 1
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -1155,7 +1155,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eL" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate4)
"eM" = (
Expand Down Expand Up @@ -1410,7 +1410,7 @@
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"fv" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/obj/effect/turf_decal/corner/blue{
Expand Down Expand Up @@ -2165,7 +2165,7 @@
},
/area/awaymission/spacebattle/cruiser)
"hS" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -2382,7 +2382,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
"iM" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate5)
"iP" = (
Expand Down Expand Up @@ -2429,7 +2429,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"jc" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate6)
"jd" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@
/turf/open/floor/holofloor,
/area/holodeck/rec_center/school)
"afh" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 4
},
/obj/effect/turf_decal/industrial/warning{
Expand Down Expand Up @@ -2905,7 +2905,7 @@
/turf/open/floor/engine/cult,
/area/wizard_station)
"ara" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/engine/cult,
/area/wizard_station)
"ard" = (
Expand Down Expand Up @@ -7016,7 +7016,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"aLP" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
Expand Down Expand Up @@ -14703,7 +14703,7 @@
/turf/open/floor/plasteel/dark,
/area/ctf)
"gFU" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/turf_decal/industrial/warning{
dir = 6
},
Expand Down Expand Up @@ -16168,7 +16168,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"nEL" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/turf_decal/industrial/warning{
dir = 10
},
Expand Down Expand Up @@ -17746,7 +17746,7 @@
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"ukC" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/turf_decal/corner/bar,
/obj/effect/turf_decal/corner/bar{
dir = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/escape_pod/escape_pod_default.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
pixel_x = -32
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/escape_pod/escape_pod_large.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"E" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"F" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/hunter/hunter_bounty.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/hunter)
"A" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
icon_state = "computer";
dir = 8
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/hunter/hunter_russian.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/hunter)
"A" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/hunter/hunter_space_cop.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"ab" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/infiltrator/infiltrator_advanced.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/syndicate/armory)
"aj" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/infiltrator/infiltrator_basic.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/bridge)
"aj" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"e" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/plasteel,
/area/shuttle/mining)
"e" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_freight.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/area/shuttle/mining)
"d" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"e" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_kilo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
/area/ship/bridge)
"Q" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"S" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_large.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/plasteel/dark,
/area/shuttle/mining/large)
"e" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/mining/mining_packed.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"n" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"o" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/pirate/pirate_default.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"ac" = (
/obj/machinery/computer/helm,
/obj/machinery/computer/ship/helm,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/corner/red,
/obj/effect/turf_decal/corner/red{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/ruin/ruin_caravan_victim.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@
/obj/effect/turf_decal/corner/blue{
dir = 8
},
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/turf/open/floor/plasteel/dark{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/ruin/ruin_pirate_cutter.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
/obj/effect/turf_decal/corner/red{
dir = 8
},
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 8
},
/turf/open/floor/plasteel/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/ruin/ruin_solgov_exploration_pod.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/turf/open/floor/plating,
/area/ship/bridge)
"j" = (
/obj/machinery/computer/helm{
/obj/machinery/computer/ship/helm{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
Loading