From 9943ca082966979f9549c24e26f1e35c83e37ab2 Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Bjarl@users.noreply.github.com> Date: Sat, 21 Sep 2024 18:32:19 -0400 Subject: [PATCH] Makes Ship Turrets Connectable Without Areas (#3386) ## About The Pull Request Hacks some stuff onto the code for turrets and turretid machines so that they can see turrets outside the area (thanks fallcon). Applies this to every single ship so that ship turrets are a little less weird. ## Why It's Good For The Game Extendable + Useful for mappers. Also less area gore. ## Changelog :cl: code: Ship Turrets can now be attached to control consoles outside the area they are in. please look at ship maps for examples on how. add: Every single ship with turrets now does the above /:cl: --- _maps/shuttles/inteq/inteq_colossus.dmm | 183 ++++++++------ _maps/shuttles/inteq/inteq_talos.dmm | 182 ++++++++------ _maps/shuttles/inteq/inteq_vaquero.dmm | 153 ++++++------ .../shuttles/nanotrasen/nanotrasen_delta.dmm | 19 +- _maps/shuttles/nanotrasen/nanotrasen_meta.dmm | 59 ++++- _maps/shuttles/pgf/pgf_crying_sun.dmm | 235 ++++++++++-------- _maps/shuttles/pirate/pirate_noderider.dmm | 53 ++-- _maps/shuttles/solgov/solgov_chronicle.dmm | 8 +- _maps/shuttles/solgov/solgov_inkwell.dmm | 103 ++++++-- .../shuttles/subshuttles/frontiersmen_gut.dmm | 16 +- _maps/shuttles/subshuttles/inteq_anvil.dmm | 14 +- _maps/shuttles/subshuttles/pgf_nail.dmm | 10 +- .../syndicate/syndicate_cybersun_kansatsu.dmm | 38 ++- .../syndicate/syndicate_gorlex_hyena.dmm | 43 +++- .../syndicate/syndicate_gorlex_komodo.dmm | 95 +++++-- .../syndicate/syndicate_twinkleshine.dmm | 54 ++-- .../machinery/porta_turret/portable_turret.dm | 40 ++- code/modules/shuttle/shuttle.dm | 3 + 18 files changed, 826 insertions(+), 482 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index f26053f39b44..e1cad73bdb2e 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -180,29 +180,6 @@ /obj/effect/turf_decal/industrial/warning/fulltile, /turf/open/floor/engine/hull/reinforced/interior, /area/ship/maintenance/starboard) -"cd" = ( -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/structure/closet/wall/directional/north{ - icon_door = "orange_wall"; - name = "uniform closet" - }, -/obj/machinery/firealarm/directional/east, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/turf/open/floor/plasteel/grimy, -/area/ship/crew) "cq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -268,6 +245,29 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/plasteel/dark, /area/ship/crew/office) +"cT" = ( +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/structure/closet/wall/directional/north{ + icon_door = "orange_wall"; + name = "uniform closet" + }, +/obj/machinery/firealarm/directional/east, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/turf/open/floor/plasteel/grimy, +/area/ship/crew) "dq" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/cable{ @@ -652,6 +652,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"gH" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 6; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew) "gJ" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 @@ -894,6 +901,25 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"ja" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/machinery/turretid/ship{ + pixel_y = 24; + id = "colossus_grid" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "jo" = ( /obj/machinery/atmospherics/components/unary/tank/toxins{ piping_layer = 1 @@ -1111,6 +1137,13 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) +"mb" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 5; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/hallway/port) "mq" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1430,12 +1463,6 @@ /obj/effect/turf_decal/techfloor, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) -"qJ" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "qK" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -1706,6 +1733,13 @@ /obj/item/pen, /turf/open/floor/plasteel/dark, /area/ship/crew/office) +"sT" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 5; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/crew) "td" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2033,6 +2067,13 @@ "vH" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) +"vJ" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 5; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/port) "vZ" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/poddoor{ @@ -2135,12 +2176,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"xh" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "xr" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 1 @@ -2406,6 +2441,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) +"Bi" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 9; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/office) "Bj" = ( /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, @@ -3005,12 +3047,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1, /turf/open/floor/plasteel/tech, /area/ship/engineering) -"Hu" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "HD" = ( /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /obj/structure/cable{ @@ -3486,24 +3522,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/plasteel/dark, /area/ship/crew/office) -"NH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/turretid/lethal{ - pixel_y = 22 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "NP" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/corner/opaque/yellow, @@ -3611,6 +3629,13 @@ }, /turf/open/floor/engine/hull/reinforced, /area/ship/maintenance/starboard) +"OI" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 6; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/starboard) "OV" = ( /obj/structure/cable{ icon_state = "2-4" @@ -3764,6 +3789,13 @@ }, /turf/open/floor/plating, /area/ship/maintenance/starboard) +"Qw" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 10; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/security/armory) "QC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -3820,12 +3852,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) -"QZ" = ( -/obj/machinery/porta_turret/ship/ballistic{ - dir = 10 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "Rb" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ name = "exhaust injector" @@ -3917,6 +3943,13 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"RZ" = ( +/obj/machinery/porta_turret/ship/ballistic{ + dir = 6; + id = "colossus_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security) "Sa" = ( /obj/effect/turf_decal/borderfloor{ dir = 4 @@ -4758,7 +4791,7 @@ XJ (8,1,1) = {" XJ XJ -xh +vJ bo bo bo @@ -4774,7 +4807,7 @@ rl rl rl rl -Oa +OI XJ "} (9,1,1) = {" @@ -4955,7 +4988,7 @@ XJ "} (17,1,1) = {" XJ -qJ +Bi ZB ZB ZB @@ -4973,7 +5006,7 @@ Dq Dq Dq Dq -QZ +Qw "} (18,1,1) = {" XJ @@ -5193,7 +5226,7 @@ XA XA XA XA -Oa +RZ "} (28,1,1) = {" Yy @@ -5219,7 +5252,7 @@ XJ "} (29,1,1) = {" XJ -Ll +mb hD hD hD @@ -5287,7 +5320,7 @@ XJ XJ XJ tX -NH +ja tI Ae Sj @@ -5320,7 +5353,7 @@ fN fN Yr zF -cd +cT GW vq gu @@ -5364,11 +5397,11 @@ XJ XJ XJ XJ -xh +sT xT xT xT -Hu +gH XJ "} (36,1,1) = {" diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 12143aa9fe2f..906f803d7c9a 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -102,6 +102,13 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/ship/engineering/communications) +"aC" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 5; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/port) "aD" = ( /obj/machinery/computer/telecomms/monitor{ network = "irmg_commnet" @@ -841,6 +848,13 @@ /obj/item/cigbutt, /turf/open/floor/plating/airless, /area/ship/storage/port) +"fs" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 5; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/engineering/communications) "fC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/opaque/yellow/warning{ @@ -2674,6 +2688,20 @@ /obj/item/radio/headset, /turf/open/floor/plasteel/tech/grid, /area/ship/crew/cryo) +"qt" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/starboard) +"qz" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 5; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/hallway/port) "qB" = ( /obj/effect/turf_decal/industrial/traffic, /obj/effect/decal/cleanable/dirt, @@ -4053,32 +4081,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating/airless, /area/ship/maintenance/port) -"zf" = ( -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/structure/closet{ - icon_door = "orange"; - name = "inteq wardrobe" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/turf/open/floor/carpet/black, -/area/ship/crew/dorm) "zg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -4443,12 +4445,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering/engine) -"Bd" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 9 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "Bh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4559,6 +4555,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"Cr" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 9; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/engineering/communications) "Cs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4653,6 +4656,32 @@ }, /turf/open/floor/plasteel/grimy, /area/ship/crew) +"CY" = ( +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/structure/closet{ + icon_door = "orange"; + name = "inteq wardrobe" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/turf/open/floor/carpet/black, +/area/ship/crew/dorm) "Dd" = ( /obj/structure/cable{ icon_state = "1-8" @@ -4823,6 +4852,13 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) +"ED" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 10; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/storage) "EL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5153,12 +5189,6 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) -"GA" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "GG" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable{ @@ -5902,9 +5932,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, /turf/open/floor/plating, /area/ship/engineering/engine) -"Me" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/template_noop) "Mf" = ( /obj/structure/chair{ dir = 4 @@ -6332,12 +6359,6 @@ /obj/structure/closet/crate, /turf/open/floor/plating/airless, /area/ship/storage/starboard) -"Pw" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 10 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "Py" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6602,6 +6623,13 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/engineering/communications) +"Rf" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security) "Rg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6693,12 +6721,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"RO" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium, -/area/template_noop) "RT" = ( /turf/open/floor/plating/airless, /area/ship/storage/port) @@ -6709,12 +6731,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/ship/maintenance/port) -"RW" = ( -/obj/machinery/turretid/lethal{ - pixel_y = 32 - }, -/turf/open/floor/carpet/orange, -/area/ship/bridge) "RY" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/hatch{ @@ -7474,6 +7490,13 @@ }, /turf/open/floor/plating, /area/ship/engineering/engine) +"WN" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6; + id = "talos_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/storage) "WR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -7483,12 +7506,6 @@ }, /turf/open/floor/carpet/orange, /area/ship/bridge) -"Xa" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "Xg" = ( /turf/open/floor/carpet/black, /area/ship/crew/dorm) @@ -7510,6 +7527,13 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) +"Xo" = ( +/obj/machinery/turretid/ship{ + pixel_y = 24; + id = "talos_grid" + }, +/turf/open/floor/carpet/orange, +/area/ship/bridge) "Xs" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -8020,7 +8044,7 @@ sw "} (5,1,1) = {" sw -Bd +Cr vp vp vp @@ -8049,7 +8073,7 @@ sV sV sV sV -Pw +ED sw "} (6,1,1) = {" @@ -8224,7 +8248,7 @@ cV "} (11,1,1) = {" sw -GA +fs vp vp sW @@ -8253,7 +8277,7 @@ sc jW sV sV -Xa +WN sw "} (12,1,1) = {" @@ -8262,7 +8286,7 @@ MV sw og sW -zf +CY GG tr Xg @@ -8601,7 +8625,7 @@ sw sw sw sw -Me +sw lC Ks IT @@ -8674,7 +8698,7 @@ lC ae bU mX -RW +Xo WR Tj mX @@ -8737,7 +8761,7 @@ sw sw sw sw -Me +sw lC qF Zj @@ -8770,8 +8794,8 @@ sw sw sw sw -Me -RO +sw +sw lC UP gp @@ -8974,7 +8998,7 @@ sw sw sw sw -GA +qz yp jj Gl @@ -8999,7 +9023,7 @@ as QR WG mK -Xa +Rf sw sw sw @@ -9589,7 +9613,7 @@ sw sw sw sw -GA +aC Pp fN Pp @@ -9608,7 +9632,7 @@ Gq If YZ fK -Xa +qt sw sw sw diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 71e191e5e584..04e3e5684ba7 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -1191,31 +1191,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) -"tx" = ( -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/storage/backpack/messenger/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/beret/sec/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/item/clothing/head/soft/inteq, -/obj/structure/closet/wall/directional/north{ - icon_door = "orange_wall"; - name = "uniform closet" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, -/turf/open/floor/carpet/black, -/area/ship/crew) "ui" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) @@ -1282,18 +1257,6 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/crew/toilet) -"vd" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 5 - }, -/obj/docking_port/mobile{ - dir = 2; - launch_status = 0; - port_direction = 8; - preferred_direction = 4 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "vg" = ( /obj/docking_port/stationary{ dir = 8; @@ -1429,12 +1392,6 @@ }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) -"xX" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "xZ" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/machinery/door/airlock/external{ @@ -1587,12 +1544,6 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) -"zP" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 6 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "zR" = ( /obj/structure/chair{ dir = 1 @@ -1981,6 +1932,13 @@ /obj/item/clothing/suit/armor/vest/security/warden/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) +"DT" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6; + id = "vaquero_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew) "Eh" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) @@ -2068,6 +2026,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/dark, /area/ship/crew/office) +"Fm" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 5; + id = "vaquero_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/office) "Fu" = ( /obj/machinery/door/airlock{ dir = 4; @@ -2274,19 +2239,6 @@ /obj/machinery/holopad/emergency/command, /turf/open/floor/carpet/orange, /area/ship/bridge) -"Iy" = ( -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/yellow{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/turretid{ - pixel_y = 25 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "IN" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2570,6 +2522,13 @@ }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"NO" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 6; + id = "vaquero_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security) "NR" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2875,12 +2834,6 @@ /obj/structure/ore_box, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Td" = ( -/obj/machinery/porta_turret/ship/weak{ - dir = 5 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "Ti" = ( /obj/machinery/vending/coffee, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -2899,6 +2852,20 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/tech, /area/ship/cargo) +"TC" = ( +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/turretid/ship{ + pixel_y = 26; + id = "vaquero_grid" + }, +/turf/open/floor/plasteel/dark, +/area/ship/bridge) "TK" = ( /obj/machinery/computer/cargo{ dir = 8 @@ -2939,6 +2906,31 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"TX" = ( +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/storage/backpack/messenger/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/beret/sec/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/item/clothing/head/soft/inteq, +/obj/structure/closet/wall/directional/north{ + icon_door = "orange_wall"; + name = "uniform closet" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt, +/turf/open/floor/carpet/black, +/area/ship/crew) "Uf" = ( /obj/structure/table, /obj/item/flashlight/lamp/green, @@ -2958,6 +2950,19 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/carpet/black, /area/ship/crew) +"UO" = ( +/obj/docking_port/mobile{ + dir = 2; + launch_status = 0; + port_direction = 8; + preferred_direction = 4 + }, +/obj/machinery/porta_turret/ship/weak{ + dir = 5; + id = "vaquero_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/medical) "UV" = ( /obj/machinery/door/airlock/public/glass{ dir = 4; @@ -3647,7 +3652,7 @@ ec lr FK Ul -Iy +TC In qe VI @@ -3675,7 +3680,7 @@ Ul sS bu Gq -tx +TX jg LB "} @@ -3700,7 +3705,7 @@ bL Gq "} (17,1,1) = {" -Td +Fm VN VN VN @@ -3717,7 +3722,7 @@ id te Gq Gq -xX +DT "} (18,1,1) = {" ww @@ -3883,7 +3888,7 @@ ww ww ww ww -vd +UO lo lo lo @@ -3894,7 +3899,7 @@ ww te te te -zP +NO ww ww ww diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm index e5890b401cfa..00967afb927e 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm @@ -1372,7 +1372,8 @@ /area/ship/engineering) "jH" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 9 + dir = 9; + id = "delta_grid" }, /turf/closed/wall/mineral/titanium, /area/ship/bridge) @@ -2057,18 +2058,14 @@ pixel_x = -24; pixel_y = -5 }, -/obj/machinery/turretid{ - icon_state = "control_kill"; - lethal = 1; - locked = 0; - pixel_y = -28; - req_access = null - }, /obj/structure/table, /obj/machinery/recharger, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/areaeditor/shuttle, +/obj/machinery/turretid/ship{ + pixel_y = -24 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "Aw" = ( @@ -2895,7 +2892,8 @@ /area/ship/science/robotics) "WG" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 4 + dir = 4; + id = "delta_grid" }, /turf/closed/wall/mineral/titanium, /area/ship/bridge) @@ -3021,7 +3019,8 @@ /area/ship/science/robotics) "YZ" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 10 + dir = 10; + id = "delta_grid" }, /turf/closed/wall/mineral/titanium, /area/ship/bridge) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm index 663a567b8bbc..1bcf7707a157 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm @@ -1679,6 +1679,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/ship/cargo) +"jo" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 4; + id = "meta_grid" + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew) "jw" = ( /obj/effect/turf_decal/corner/transparent/bar/diagonal, /obj/effect/decal/cleanable/dirt/dust, @@ -2198,6 +2205,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"uT" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 4; + id = "meta_grid" + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/canteen/kitchen) "ve" = ( /obj/effect/turf_decal/box/corners, /obj/machinery/light/broken/directional/south, @@ -2384,6 +2398,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) +"yF" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 1; + id = "meta_grid" + }, +/turf/closed/wall/mineral/titanium, +/area/ship/engineering) "yS" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed{ @@ -2910,10 +2931,9 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/turretid{ +/obj/machinery/turretid/ship{ pixel_y = -24; - req_access = null; - locked = 0 + id = "meta_grid" }, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -3060,10 +3080,11 @@ /area/ship/engineering) "Lo" = ( /obj/machinery/porta_turret/ship/weak{ - dir = 1 + dir = 2; + id = "meta_grid" }, /turf/closed/wall/mineral/titanium, -/area/ship/bridge) +/area/ship/engineering) "Lq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3458,6 +3479,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"TR" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 2; + id = "meta_grid" + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/canteen) +"TV" = ( +/obj/machinery/porta_turret/ship/weak{ + dir = 1; + id = "meta_grid" + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew) "Uk" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3861,7 +3896,7 @@ aa "} (6,1,1) = {" aa -Lo +yF ac ri Pr @@ -4186,7 +4221,7 @@ aa "} (19,1,1) = {" aa -Lo +TV ai ai MU @@ -4206,7 +4241,7 @@ sA Uk an bD -Lo +TR aa "} (20,1,1) = {" @@ -4412,12 +4447,12 @@ aa (28,1,1) = {" aa aa -Lo +jo ai ai ai ai -Lo +jo aa aa aa @@ -4425,12 +4460,12 @@ aa aa aa aa -Lo +uT cO cO cO cO -Lo +uT aa aa "} diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index ad52c8b853d8..bbfb109c6c36 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -424,16 +424,6 @@ }, /turf/open/floor/plating, /area/ship/engineering/engines/starboard) -"du" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 6; - mode = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "dv" = ( /obj/structure/cable/blue{ icon_state = "0-4" @@ -534,6 +524,29 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) +"ee" = ( +/obj/effect/turf_decal/corner_steel_grid{ + dir = 9 + }, +/obj/effect/turf_decal/corner_steel_grid{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "lib_bridge_shut"; + name = "Bridge Shutters"; + pixel_y = 20; + pixel_x = 8 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/machinery/turretid/ship{ + pixel_y = 24; + pixel_x = -7; + id = "crying_sun_grid" + }, +/turf/open/floor/plasteel/mono/dark, +/area/ship/bridge) "ej" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -1046,17 +1059,6 @@ }, /turf/open/floor/plating, /area/ship/bridge) -"if" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/catwalk/over/plated_catwalk/dark, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 4; - mode = 1 - }, -/turf/open/floor/plating/airless, -/area/ship/external/dark) "ih" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset, @@ -1188,6 +1190,17 @@ }, /turf/open/floor/plasteel/mono, /area/ship/hangar/starboard) +"jg" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 5; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "jh" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 1 @@ -1473,6 +1486,17 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/airless, /area/ship/external/dark) +"mf" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 8; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) "mk" = ( /obj/structure/table/wood, /obj/item/toy/plush/sharai{ @@ -3071,28 +3095,6 @@ }, /turf/open/floor/vault, /area/ship/security/armory) -"Aq" = ( -/obj/effect/turf_decal/corner_steel_grid{ - dir = 9 - }, -/obj/effect/turf_decal/corner_steel_grid{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "lib_bridge_shut"; - name = "Bridge Shutters"; - pixel_y = 20; - pixel_x = 8 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/turretid{ - pixel_y = 23; - pixel_x = -8 - }, -/turf/open/floor/plasteel/mono/dark, -/area/ship/bridge) "Ar" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 9 @@ -3162,6 +3164,18 @@ "At" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/security/armory) +"Az" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 4; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "AL" = ( /obj/machinery/vending/toyliberationstation, /turf/open/floor/plasteel/tech, @@ -3441,16 +3455,6 @@ "CD" = ( /turf/open/floor/plasteel/white, /area/ship/crew/canteen) -"CF" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 10; - mode = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "CO" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/corner_steel_grid/full{ @@ -3608,6 +3612,17 @@ /obj/item/clothing/head/helmet/space/gezena, /turf/open/floor/plating, /area/ship/engineering) +"DG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 5; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "DJ" = ( /obj/effect/turf_decal/industrial/traffic, /obj/structure/sign/flag/gezena{ @@ -3721,14 +3736,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/ship/hallway/central) -"Eu" = ( -/obj/structure/cable, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 5; - mode = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "EA" = ( /obj/structure/sign/poster/contraband/pgf{ pixel_y = 32 @@ -3985,16 +3992,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/central) -"FJ" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 5; - mode = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "FN" = ( /obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/door/poddoor{ @@ -4006,16 +4003,6 @@ }, /turf/open/floor/plating, /area/ship/engineering/engines/starboard) -"FO" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 8; - mode = 1 - }, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) "FU" = ( /obj/effect/turf_decal/corner_steel_grid{ dir = 10 @@ -4242,16 +4229,6 @@ /obj/effect/turf_decal/corner/opaque/neutral/full, /turf/open/floor/vault, /area/ship/security/armory) -"Hb" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/porta_turret/ship/pgf/light{ - dir = 5; - mode = 1 - }, -/turf/open/floor/engine/hull, -/area/ship/external/dark) "Hf" = ( /obj/structure/railing, /obj/effect/turf_decal/corner_steel_grid{ @@ -4259,6 +4236,18 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/crew/cryo) +"Hl" = ( +/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 4; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "Hn" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/cryo) @@ -5846,6 +5835,17 @@ /obj/machinery/light/floor/hangar, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"Tp" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 10; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Tw" = ( /obj/structure/cable{ icon_state = "0-2" @@ -6287,6 +6287,17 @@ }, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"Wi" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 6; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Wk" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -6357,6 +6368,17 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating/airless, /area/ship/external/dark) +"WU" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 5; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "WV" = ( /obj/effect/turf_decal/trimline/opaque/bottlegreen/filled/line{ dir = 4 @@ -6676,6 +6698,15 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engines/port) +"Zr" = ( +/obj/structure/cable, +/obj/machinery/porta_turret/ship/pgf/light{ + dir = 5; + mode = 1; + id = "crying_sun_grid" + }, +/turf/open/floor/engine/hull, +/area/ship/external/dark) "Zw" = ( /obj/structure/railing{ dir = 4 @@ -6849,7 +6880,7 @@ CB AM UM lc -FO +mf LD TV bB @@ -7203,7 +7234,7 @@ xz (15,1,1) = {" xz xz -FJ +jg ow ow mG @@ -7281,7 +7312,7 @@ xK zz DT SB -CF +Tp xz "} (18,1,1) = {" @@ -7400,7 +7431,7 @@ xz xz xz Si -KB +DG KM Te EM @@ -7457,7 +7488,7 @@ xz xz xz eR -Eu +Zr KP BX xy @@ -7589,7 +7620,7 @@ Bq oR Ne SB -du +Wi xz "} (29,1,1) = {" @@ -7794,7 +7825,7 @@ xz xz xz xz -Hb +WU xk UE pW @@ -7992,7 +8023,7 @@ xz xz xz MF -Aq +ee Xs jm jH @@ -8075,7 +8106,7 @@ xz xz xz xz -Hb +WU vr dK Gb @@ -8252,11 +8283,11 @@ xz xz xz xz -if +Hl xz xz xz -if +Az xz xz xz diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm index 2e0352c54a58..6861f971143f 100644 --- a/_maps/shuttles/pirate/pirate_noderider.dmm +++ b/_maps/shuttles/pirate/pirate_noderider.dmm @@ -341,10 +341,11 @@ /area/ship/crew) "et" = ( /obj/machinery/porta_turret/ship{ - dir = 5 + dir = 5; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/security/armory) "ev" = ( /obj/machinery/power/rtg, /obj/structure/cable{ @@ -578,10 +579,11 @@ /area/ship/crew) "iH" = ( /obj/machinery/porta_turret/ship{ - dir = 9 + dir = 9; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "iJ" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/spline/fancy/opaque/black{ @@ -965,6 +967,13 @@ /obj/item/pickaxe/drill, /turf/open/floor/plasteel/dark, /area/ship/cargo) +"oX" = ( +/obj/machinery/porta_turret/ship{ + dir = 4; + id = "jupiter_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security/armory) "pi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1596,6 +1605,13 @@ /obj/effect/turf_decal/spline/fancy/opaque/black, /turf/open/floor/plasteel/tech/grid, /area/ship/maintenance/central) +"yH" = ( +/obj/machinery/porta_turret/ship{ + dir = 4; + id = "jupiter_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/bridge) "yI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1733,7 +1749,8 @@ /area/ship/engineering) "Az" = ( /obj/machinery/porta_turret/ship{ - dir = 6 + dir = 6; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) @@ -2578,10 +2595,11 @@ /area/ship/maintenance/central) "MX" = ( /obj/machinery/porta_turret/ship{ - dir = 1 + dir = 1; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/maintenance/central) "MZ" = ( /obj/structure/cable{ icon_state = "0-8" @@ -2862,10 +2880,11 @@ /area/ship/cargo) "RE" = ( /obj/machinery/porta_turret/ship{ - dir = 4 + dir = 4; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/crew) "RI" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2889,10 +2908,11 @@ /area/ship/engineering) "Ss" = ( /obj/machinery/porta_turret/ship{ - dir = 10 + dir = 10; + id = "jupiter_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "SP" = ( /obj/machinery/power/shieldwallgen/anchored, /obj/structure/cable, @@ -2982,9 +3002,12 @@ /turf/open/floor/plating/airless, /area/ship/external) "VC" = ( -/obj/machinery/porta_turret/ship, +/obj/machinery/porta_turret/ship{ + dir = 2; + id = "jupiter_grid" + }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/maintenance/central) "VF" = ( /obj/machinery/ai_slipper, /obj/effect/turf_decal/spline/fancy/opaque/black, @@ -4102,7 +4125,7 @@ qc Th Kc by -RE +oX by oJ Ne @@ -4192,7 +4215,7 @@ by by by by -RE +yH by by by diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm index 19730904ab41..56cbecce667b 100644 --- a/_maps/shuttles/solgov/solgov_chronicle.dmm +++ b/_maps/shuttles/solgov/solgov_chronicle.dmm @@ -3352,12 +3352,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/engineering) -"GH" = ( -/obj/effect/turf_decal/corner/opaque/solgovgold{ - dir = 6 - }, -/turf/template_noop, -/area/template_noop) "GP" = ( /obj/machinery/door/airlock/solgov{ dir = 4; @@ -5313,7 +5307,7 @@ pS pS KZ KZ -GH +pS AN Bz Wn diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm index d89314c2f769..cb52200b4aa9 100644 --- a/_maps/shuttles/solgov/solgov_inkwell.dmm +++ b/_maps/shuttles/solgov/solgov_inkwell.dmm @@ -1,4 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 6 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/canteen/kitchen) "af" = ( /obj/effect/turf_decal/techfloor{ dir = 1 @@ -62,6 +69,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ship/crew/library) +"aB" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 5 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/security/armory) "aO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -1045,6 +1059,13 @@ /obj/item/tank/jetpack/oxygen, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) +"hk" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 6 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/toilet) "hl" = ( /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 1 @@ -1088,9 +1109,12 @@ /turf/open/floor/plasteel/mono, /area/ship/cargo) "hE" = ( -/obj/machinery/porta_turret/ship/solgov, +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 6 + }, /turf/closed/wall/mineral/titanium, -/area/ship/bridge) +/area/ship/storage) "hF" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -1620,6 +1644,13 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) +"kE" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 9 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/maintenance/starboard) "kK" = ( /obj/machinery/door/window/brigdoor/westleft, /obj/structure/rack, @@ -1729,9 +1760,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/turretid/lethal{ +/obj/machinery/turretid/ship{ pixel_x = -26; - pixel_y = 0 + id = "inkwell_grid" }, /turf/open/floor/plasteel/stairs/wood/left{ dir = 1 @@ -2138,6 +2169,13 @@ }, /turf/open/floor/plasteel/mono, /area/ship/cargo) +"nN" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 10 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/maintenance/starboard) "nO" = ( /obj/machinery/computer/cargo/solgov, /turf/open/floor/wood/maple, @@ -2548,6 +2586,13 @@ }, /turf/open/floor/plasteel/mono, /area/ship/cargo) +"qF" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 10 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/maintenance/port) "qG" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt/dust, @@ -3572,6 +3617,13 @@ }, /turf/open/floor/plating, /area/ship/crew/dorm/dormthree) +"wn" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 5 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/toilet) "wo" = ( /obj/item/clothing/gloves/combat, /obj/item/folder/solgov, @@ -4346,6 +4398,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/engineering) +"BN" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 9 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/maintenance/port) "BO" = ( /obj/effect/turf_decal/industrial/warning, /obj/effect/turf_decal/industrial/warning{ @@ -4565,6 +4624,13 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"CY" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 5 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/crew/canteen/kitchen) "Dc" = ( /obj/effect/turf_decal/corner/opaque/solgovblue/full, /obj/structure/cable{ @@ -5201,6 +5267,13 @@ }, /turf/open/floor/plasteel/mono, /area/ship/cargo) +"Hl" = ( +/obj/machinery/porta_turret/ship/solgov{ + id = "inkwell_grid"; + dir = 1 + }, +/turf/closed/wall/mineral/titanium, +/area/ship/bridge) "Ho" = ( /obj/structure/chair/comfy/grey/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, @@ -7844,12 +7917,12 @@ (1,1,1) = {" iG -hE +BN UJ Hp Hp zI -hE +qF iG iG iG @@ -7867,12 +7940,12 @@ iG iG iG iG -hE +kE ni dv dv vY -hE +nN iG iG "} @@ -8047,7 +8120,7 @@ DH iG "} (7,1,1) = {" -hE +Hl XY DE Cq @@ -8077,7 +8150,7 @@ Np ts qx ts -hE +ts iG "} (8,1,1) = {" @@ -8489,7 +8562,7 @@ sJ iG "} (20,1,1) = {" -hE +aB SI kK LJ @@ -9000,7 +9073,7 @@ iG "} (35,1,1) = {" iG -hE +wn ea pc cH @@ -9028,7 +9101,7 @@ FE nA yE AA -hE +aa iG iG "} @@ -9038,7 +9111,7 @@ iG DS DS DS -hE +hk iG iG iG @@ -9058,7 +9131,7 @@ iG iG iG iG -hE +CY qc qc FE diff --git a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm index 6044e1011891..d27da7c54e5e 100644 --- a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm +++ b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm @@ -61,7 +61,8 @@ /area/ship/storage) "dJ" = ( /obj/machinery/porta_turret/ship/ballistic{ - dir = 5 + dir = 5; + id = "gut_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ship/storage) @@ -305,6 +306,10 @@ dir = 9 }, /obj/machinery/computer/helm, +/obj/machinery/turretid/ship{ + pixel_y = 24; + id = "gut_grid" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) "sk" = ( @@ -397,7 +402,8 @@ /area/ship/storage) "vJ" = ( /obj/machinery/porta_turret/ship/ballistic{ - dir = 9 + dir = 9; + id = "gut_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ship/storage) @@ -478,7 +484,8 @@ /area/ship/storage) "GQ" = ( /obj/machinery/porta_turret/ship/ballistic{ - dir = 5 + dir = 5; + id = "gut_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/storage) @@ -576,7 +583,8 @@ /area/ship/storage) "RY" = ( /obj/machinery/porta_turret/ship/ballistic{ - dir = 9 + dir = 9; + id = "gut_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/storage) diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm index 4a4c4073ced1..002ddfe6d0d3 100644 --- a/_maps/shuttles/subshuttles/inteq_anvil.dmm +++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm @@ -194,7 +194,8 @@ "x" = ( /obj/machinery/porta_turret/ship/weak{ faction = list("playerInteq","turret"); - dir = 1 + dir = 9; + id = "anvil_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) @@ -225,10 +226,11 @@ /obj/effect/turf_decal/corner/opaque/yellow, /obj/structure/chair/comfy/shuttle, /obj/effect/landmark/ert_shuttle_spawn, -/obj/machinery/turretid{ - pixel_y = 25 - }, /obj/machinery/light/directional/east, +/obj/machinery/turretid/ship{ + pixel_y = 24; + id = "anvil_grid" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "B" = ( @@ -386,7 +388,9 @@ /area/ship/bridge) "T" = ( /obj/machinery/porta_turret/ship/weak{ - faction = list("playerInteq","turret") + faction = list("playerInteq","turret"); + dir = 10; + id = "anvil_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) diff --git a/_maps/shuttles/subshuttles/pgf_nail.dmm b/_maps/shuttles/subshuttles/pgf_nail.dmm index 02255b90a5c0..6b0c12bc7f53 100644 --- a/_maps/shuttles/subshuttles/pgf_nail.dmm +++ b/_maps/shuttles/subshuttles/pgf_nail.dmm @@ -115,6 +115,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, +/obj/machinery/turretid/ship{ + pixel_y = -30; + pixel_x = -2; + id = "nail_grid" + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "p" = ( @@ -390,9 +395,10 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/porta_turret/ship/weak{ +/obj/machinery/porta_turret/ship/pgf/light{ dir = 8; - mode = 1 + mode = 1; + id = "nail_grid" }, /turf/open/floor/engine/hull/reinforced/interior, /area/ship/external/dark) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index ffc2472b5dec..67eaf609e080 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -887,13 +887,6 @@ /obj/effect/landmark/observer_start, /turf/open/floor/plasteel/white, /area/ship/hallway/central) -"tV" = ( -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 4; - pixel_x = 8 - }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) "uq" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 10 @@ -902,10 +895,11 @@ /area/ship/bridge) "uR" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 9 + dir = 9; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "vk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1135,10 +1129,11 @@ /area/ship/cargo) "Ah" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 6 + dir = 6; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "AM" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning, /obj/effect/turf_decal/trimline/opaque/syndiered/filled/warning{ @@ -1194,10 +1189,11 @@ /area/ship/crew/dorm) "CR" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 10 + dir = 10; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "CU" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -1313,7 +1309,7 @@ /obj/machinery/porta_turret/ship/syndicate/weak{ dir = 4; pixel_x = 8; - pixel_y = 4 + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) @@ -1417,10 +1413,11 @@ /area/ship/bridge) "KA" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5 + dir = 5; + id = "kansatsu_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "KP" = ( /obj/structure/closet/wall/directional/north{ name = "emergency rum cabinet" @@ -1457,10 +1454,11 @@ dir = 4; name = "Captain's Chair" }, -/obj/machinery/turretid{ - pixel_y = 28 - }, /obj/effect/turf_decal/trimline/opaque/bar, +/obj/machinery/turretid/ship{ + pixel_y = 26; + id = "kansatsu_grid" + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "MH" = ( @@ -2302,7 +2300,7 @@ YQ YQ YQ YQ -tV +GV bO bO dA diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 3649eed505b2..66133d79d47a 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -333,6 +333,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) +"ge" = ( +/obj/machinery/porta_turret/ship/syndicate{ + dir = 2; + id = "hyena_grid" + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm) "gg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, @@ -1619,15 +1626,19 @@ /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "BG" = ( -/obj/machinery/porta_turret/ship/ballistic, +/obj/machinery/porta_turret/ship/syndicate{ + dir = 8; + id = "hyena_grid" + }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/area/ship/storage) "BR" = ( /obj/machinery/porta_turret/ship/syndicate{ - dir = 1 + dir = 1; + id = "hyena_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/area/ship/maintenance/port) "BZ" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/machinery/suit_storage_unit/inherit{ @@ -2291,9 +2302,12 @@ /turf/open/floor/carpet/red_gold, /area/ship/bridge) "NA" = ( -/obj/machinery/porta_turret/ship/syndicate, +/obj/machinery/porta_turret/ship/syndicate{ + dir = 2; + id = "hyena_grid" + }, /turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) +/area/ship/maintenance/starboard) "NF" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) @@ -2459,10 +2473,11 @@ /area/ship/cargo) "Qz" = ( /obj/machinery/porta_turret/ship/syndicate{ - dir = 6 + dir = 6; + id = "hyena_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/maintenance/fore) "QG" = ( /obj/structure/closet/secure_closet{ anchored = 1; @@ -2861,8 +2876,9 @@ /turf/open/floor/carpet/red_gold, /area/ship/bridge) "Up" = ( -/obj/machinery/porta_turret/ship/syndicate/heavy{ - dir = 4 +/obj/machinery/porta_turret/ship/syndicate{ + dir = 4; + id = "hyena_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) @@ -2878,10 +2894,11 @@ /area/ship/crew) "UN" = ( /obj/machinery/porta_turret/ship/syndicate{ - dir = 1 + dir = 1; + id = "hyena_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/hallway/central) "UX" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) @@ -3581,7 +3598,7 @@ UX GV GV GV -NA +ge nn Zb "} diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index d218dc5581b1..2b4cfd484e98 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -122,6 +122,9 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"bC" = ( +/turf/template_noop, +/area/ship/cargo) "bM" = ( /obj/effect/turf_decal/industrial/warning{ dir = 8 @@ -312,10 +315,11 @@ /area/ship/hallway/central) "ea" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 6 + dir = 6; + id = "komodo_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/maintenance/starboard) "en" = ( /obj/structure/railing/corner{ dir = 8 @@ -1126,10 +1130,11 @@ /area/ship/crew/canteen) "kG" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 1 + dir = 1; + id = "komodo_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/hallway/central) "kI" = ( /turf/open/floor/engine, /area/ship/bridge) @@ -1315,6 +1320,13 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"mq" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 1; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/cargo) "my" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -1681,10 +1693,11 @@ /area/ship/engineering) "pN" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 9 + dir = 9; + id = "komodo_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "qf" = ( /obj/structure/railing{ dir = 8 @@ -1892,10 +1905,11 @@ /area/ship/bridge) "rS" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5 + dir = 5; + id = "komodo_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/maintenance/port) "rX" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -2914,9 +2928,12 @@ /turf/open/floor/plasteel/tech, /area/ship/bridge) "Bx" = ( -/obj/machinery/porta_turret/ship/syndicate/weak, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 10; + id = "komodo_grid" + }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/crew/dorm) "BK" = ( /obj/effect/turf_decal/box, /obj/machinery/shower{ @@ -2968,6 +2985,13 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/engineering) +"BU" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 2; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security/armory) "BY" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 1 @@ -3113,6 +3137,13 @@ "Ep" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/cargo) +"Es" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 9; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/cargo) "EB" = ( /obj/structure/closet/crate{ name = "food crate" @@ -3442,6 +3473,13 @@ /obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) +"Hx" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 2; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/hallway/central) "HF" = ( /obj/effect/turf_decal/industrial/warning{ dir = 4 @@ -3754,6 +3792,13 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) +"KJ" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 10; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/starboard) "KK" = ( /obj/structure/closet/wall/orange/directional/south{ name = "Engineering locker" @@ -4142,8 +4187,8 @@ /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/north, -/obj/machinery/turretid{ - pixel_y = 2 +/obj/machinery/turretid/ship{ + id = "komodo_grid" }, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -4181,10 +4226,11 @@ /area/ship/hallway/central) "OP" = ( /obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 10 + dir = 10; + id = "komodo_grid" }, /turf/closed/wall/mineral/plastitanium, -/area/ship/bridge) +/area/ship/engineering) "OQ" = ( /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/starboard) @@ -4560,6 +4606,13 @@ }, /turf/open/floor/plasteel/tech, /area/ship/bridge) +"RX" = ( +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 9; + id = "komodo_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/maintenance/port) "RZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -5735,7 +5788,7 @@ CM "} (11,1,1) = {" CM -CM +bC Ep uJ es @@ -5755,7 +5808,7 @@ Bx "} (12,1,1) = {" CM -kG +Es Ep jA jA @@ -5895,7 +5948,7 @@ tf "} (19,1,1) = {" CM -kG +mq Ep Ep We @@ -5911,7 +5964,7 @@ gE wT Im gE -Bx +BU "} (20,1,1) = {" CM @@ -5970,7 +6023,7 @@ Dd Dd Dd Dd -Bx +Hx CM "} (23,1,1) = {" @@ -6135,7 +6188,7 @@ CM "} (31,1,1) = {" CM -pN +RX gN nU iL @@ -6151,7 +6204,7 @@ Dd JJ Hc OQ -OP +KJ "} (32,1,1) = {" CM diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index bca4d457916a..30ce8ed19013 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -263,11 +263,6 @@ "bQ" = ( /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner, /obj/machinery/light/directional/north, -/obj/machinery/turretid{ - pixel_y = 32; - req_access = null; - req_access_txt = "150" - }, /obj/effect/turf_decal/spline/fancy/opaque/black/corner, /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{ dir = 4 @@ -1559,6 +1554,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/bridge) +"iX" = ( +/obj/machinery/porta_turret/ship/syndicate/heavy{ + dir = 10; + id = "twink_grid" + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/engineering/atmospherics) "iZ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/filled/line{ dir = 1 @@ -2178,12 +2182,13 @@ /area/ship/engineering/engine) "ms" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ - dir = 9 + dir = 9; + id = "twink_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/bridge) +/area/ship/engineering/atmospherics) "mt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 8 @@ -3631,12 +3636,13 @@ /area/ship/engineering/atmospherics) "vd" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ - dir = 5 + dir = 5; + id = "twink_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/bridge) +/area/ship/hallway/port) "vl" = ( /obj/machinery/sleeper/syndie{ dir = 8 @@ -6691,12 +6697,13 @@ /area/ship/engineering/engine) "Mr" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ - dir = 6 + dir = 6; + id = "twink_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/bridge) +/area/ship/hallway/starboard) "Mw" = ( /obj/effect/turf_decal/industrial/caution/red, /obj/effect/decal/cleanable/shreds{ @@ -7954,6 +7961,15 @@ /obj/machinery/vending/tool, /turf/open/floor/plasteel/dark, /area/ship/engineering/atmospherics) +"TH" = ( +/obj/machinery/porta_turret/ship/syndicate/heavy{ + dir = 9; + id = "twink_grid" + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal{ + rad_insulation = 0 + }, +/area/ship/crew/canteen) "TI" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -8390,12 +8406,13 @@ /area/ship/crew/cryo) "We" = ( /obj/machinery/porta_turret/ship/syndicate/heavy{ - dir = 10 + dir = 10; + id = "twink_grid" }, /turf/closed/wall/r_wall/syndicate/nodiagonal{ rad_insulation = 0 }, -/area/ship/bridge) +/area/ship/security) "Wj" = ( /obj/effect/turf_decal/corner/opaque/syndiered{ dir = 5 @@ -8568,6 +8585,13 @@ dir = 8 }, /obj/machinery/fax/syndicate, +/obj/machinery/turretid/ship{ + pixel_y = 24; + pixel_x = -5; + id = "twink_grid"; + req_access = null; + req_access_txt = "150" + }, /turf/open/floor/mineral/plastitanium, /area/ship/bridge) "Xf" = ( @@ -9118,7 +9142,7 @@ FR FR LX ae -We +iX mp mp mp @@ -9617,7 +9641,7 @@ mp mp "} (17,1,1) = {" -ms +TH xj xj xj diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 884c103d0e0f..33e493b3819e 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -101,6 +101,9 @@ DEFINE_BITFIELD(turret_flags, list( var/datum/action/turret_toggle/toggle_action /// Mob that is remotely controlling the turret var/mob/remote_controller + /// For connecting to additional turrets + var/id = "" + /obj/machinery/porta_turret/Initialize() . = ..() @@ -122,6 +125,13 @@ DEFINE_BITFIELD(turret_flags, list( if(!has_cover) INVOKE_ASYNC(src, PROC_REF(popUp)) +/obj/machinery/porta_turret/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[REF(port)][id]" + port.turret_list |= WEAKREF(src) + +/obj/machinery/porta_turret/disconnect_from_shuttle(obj/docking_port/mobile/port) + port.turret_list -= WEAKREF(src) + /obj/machinery/porta_turret/proc/toggle_on(set_to) var/current = on if (!isnull(set_to)) @@ -901,7 +911,7 @@ DEFINE_BITFIELD(turret_flags, list( base_icon_state = "control" density = FALSE req_access = list(ACCESS_AI_UPLOAD) - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF /// Variable dictating if linked turrets are active and will shoot targets var/enabled = TRUE /// Variable dictating if linked turrets will shoot lethal projectiles @@ -916,6 +926,8 @@ DEFINE_BITFIELD(turret_flags, list( var/shoot_cyborgs = FALSE /// List of all linked turrets var/list/turrets = list() + ///id for connecting to additional turrets + var/id = "" /obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0) . = ..() @@ -935,17 +947,13 @@ DEFINE_BITFIELD(turret_flags, list( if(!mapload) return - if(control_area) - control_area = get_area_instance_from_text(control_area) - if(control_area == null) - control_area = get_area(src) - stack_trace("Bad control_area path for [src], [src.control_area]") - else if(!control_area) - control_area = get_area(src) - - for(var/obj/machinery/porta_turret/T in control_area) - turrets |= T - T.cp = src +/obj/machinery/turretid/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock) + id = "[REF(port)][id]" + for(var/datum/weakref/ship_guns in port.turret_list) + var/obj/machinery/porta_turret/turret_gun = ship_guns.resolve() + if(turret_gun.id == id) + turrets |= turret_gun + turret_gun.cp = src /obj/machinery/turretid/examine(mob/user) . += ..() @@ -970,7 +978,8 @@ DEFINE_BITFIELD(turret_flags, list( if (issilicon(user)) return attack_hand(user) - if (get_dist(src, user) == 0) // trying to unlock the interface + // trying to unlock the interface + if (in_range(src, user)) if (allowed(usr)) if(obj_flags & EMAGGED) to_chat(user, "The turret control is unresponsive!") @@ -1069,6 +1078,10 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/turretid/lethal lethal = TRUE +/obj/machinery/turretid/ship + req_ship_access = TRUE + + /obj/item/wallframe/turret_control name = "turret control frame" desc = "Used for building turret control panels." @@ -1114,3 +1127,4 @@ DEFINE_BITFIELD(turret_flags, list( /obj/item/gun/energy/e_gun/turret/get_turret_properties() . = ..() + diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 14a7497728a9..084d4a49f3e7 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -321,6 +321,9 @@ ///A list of all gravity generators currently linked to the shuttle. var/list/gravgen_list = list() + ///A list of all turrets currently linked to the shuttle. + var/list/turret_list = list() + ///if this shuttle can move docking ports other than the one it is docked at var/can_move_docking_ports = TRUE