diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index d1a3ff05cf04..312e11abe0f4 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -1698,10 +1698,6 @@ }, /turf/open/floor/plasteel, /area/ruin/beach/oceantown/shop) -"ww" = ( -/obj/structure/statue/sandstone/assistant, -/turf/open/floor/plating/asteroid/sand/lit, -/area/overmap_encounter/planetoid/beachplanet/explored) "wF" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -7687,7 +7683,7 @@ sa sa Ud sa -ww +sa sa Ud sa diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index d40ca2c82b27..557a50d9a11e 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -192,7 +192,9 @@ /area/overmap_encounter/planetoid/jungle/explored) "bU" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/statue/sandstone/assistant, +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, /obj/machinery/light_switch{ pixel_y = 21; pixel_x = -10 diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm index 8f3921ed0520..336588e2d807 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm @@ -2024,7 +2024,6 @@ /turf/open/floor/engine/hull/interior, /area/overmap_encounter/planetoid/lava/explored) "Hl" = ( -/obj/structure/statue/sandstone/assistant, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 @@ -2380,7 +2379,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/unpowered/crashed_starwalker) "Mk" = ( -/obj/structure/statue/sandstone/assistant, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/pod/light, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm index fda16098a148..768c6275cf56 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm @@ -2155,6 +2155,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper, /turf/open/floor/plasteel/dark, /area/ruin/lavaland/factory/dorms) "tN" = ( @@ -6370,7 +6371,7 @@ LP vE DB Cc -KX +yQ Gn hv JO @@ -6424,7 +6425,7 @@ vE EU Vw Id -KX +yQ PR KX PR @@ -6478,7 +6479,7 @@ ab vQ LL Kg -KX +yQ Gw KX Gw @@ -6532,7 +6533,7 @@ yQ yQ yQ yQ -KX +yQ KX KX KX diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index 397dff3689ee..6906e1dd2bed 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -1447,7 +1447,7 @@ /obj/machinery/door/airlock/hatch{ welded = 1 }, -/turf/template_noop, +/turf/open/floor/plating, /area/ruin/whitesands/pubbycrash/split) "ET" = ( /obj/structure/cable/yellow{ diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm index 26474b9c4c2f..11d98b3c1475 100644 --- a/_maps/shuttles/independent/independent_mudskipper.dmm +++ b/_maps/shuttles/independent/independent_mudskipper.dmm @@ -1016,6 +1016,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned/grid, /area/ship/cargo) +"xR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile, +/obj/machinery/door/poddoor/shutters{ + id = "mudskipper_window" + }, +/turf/open/floor/plating, +/area/ship/hallway/aft) "xU" = ( /obj/machinery/power/terminal{ dir = 1 @@ -1051,7 +1059,7 @@ /obj/machinery/door/poddoor/shutters{ id = "mudskipper_window" }, -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/cargo) "yB" = ( @@ -1431,7 +1439,7 @@ dir = 4; id = "mudskipper_bridge" }, -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/bridge) "Gq" = ( @@ -1811,7 +1819,7 @@ /obj/machinery/door/poddoor/shutters{ id = "mudskipper_window" }, -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/hallway/aft) "PU" = ( @@ -1823,10 +1831,10 @@ "Qt" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/layer_manifold, +/obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor/shutters{ id = "mudskipper_window" }, -/obj/structure/window/fulltile, /turf/open/floor/plating, /area/ship/engineering/engine) "Qu" = ( @@ -2224,7 +2232,7 @@ /obj/machinery/door/poddoor/shutters{ id = "mudskipper_window" }, -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/hallway/aft) "XI" = ( @@ -2278,7 +2286,7 @@ /obj/machinery/door/poddoor/shutters{ id = "mudskipper_window" }, -/obj/structure/window/fulltile, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/ship/crew) "Yi" = ( @@ -2566,7 +2574,7 @@ cs hX cs cs -Xm +xR yg XK Ni diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 247743c165bf..00b25f936eab 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -100,6 +100,8 @@ /obj/machinery/suit_storage_unit/inherit, /obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/light/small/directional/north, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, /turf/open/floor/plasteel, /area/ship/crew/office) "bx" = ( @@ -663,6 +665,7 @@ /obj/item/clothing/glasses/hud/security/sunglasses/inteq, /obj/item/clothing/head/helmet/swat/inteq, /obj/item/clothing/mask/gas/sechailer, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel, /area/ship/crew/office) "gb" = ( @@ -746,8 +749,8 @@ "gq" = ( /obj/machinery/light_switch{ dir = 1; - pixel_y = -20; - pixel_x = -3 + pixel_x = -3; + pixel_y = -20 }, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) @@ -1042,14 +1045,32 @@ /turf/open/floor/plating, /area/ship/medical/surgery) "jN" = ( -/obj/structure/chair/office, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 }, -/obj/effect/turf_decal/corner/transparent/inteqbrown/half, -/turf/open/floor/plasteel, -/area/ship/crew/office) +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/rack, +/obj/item/storage/belt/security/webbing/inteq{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/storage/belt/security/webbing/inteq{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/clothing/head/helmet/inteq{ + pixel_x = -9; + pixel_y = 6 + }, +/obj/item/clothing/head/helmet/inteq{ + pixel_x = -7 + }, +/turf/open/floor/plasteel/dark, +/area/ship/security) "jQ" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/directional/east, @@ -1087,8 +1108,8 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -20; - pixel_x = 4 + pixel_x = 4; + pixel_y = -20 }, /turf/open/floor/plasteel/patterned/ridged, /area/ship/medical) @@ -1178,22 +1199,8 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = 28 }, -/obj/structure/rack, -/obj/item/storage/belt/security/webbing/inteq{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/storage/belt/security/webbing/inteq{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/clothing/head/helmet/inteq{ - pixel_x = -9; - pixel_y = 6 - }, -/obj/item/clothing/head/helmet/inteq{ - pixel_x = -7 - }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "kL" = ( @@ -1296,15 +1303,18 @@ /area/ship/crew/canteen) "lN" = ( /obj/structure/table, -/obj/machinery/door/window/southleft, +/obj/item/paper_bin, +/obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 }, /obj/effect/turf_decal/corner/transparent/inteqbrown/full, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/plasteel/patterned, /area/ship/crew/office) "lW" = ( @@ -1995,9 +2005,6 @@ /area/ship/maintenance/port) "rY" = ( /obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 4 - }, /obj/effect/turf_decal/corner/opaque/brown{ dir = 8 }, @@ -2008,7 +2015,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/dark, /area/ship/security) "sb" = ( @@ -2598,11 +2604,9 @@ /area/ship/medical) "xr" = ( /obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/window/reinforced, +/obj/machinery/door/window/southleft, /obj/structure/window/reinforced{ - dir = 4 + dir = 8 }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -2938,7 +2942,6 @@ dir = 1 }, /obj/effect/turf_decal/steeldecal/steel_decals_central7, -/obj/machinery/airalarm/directional/north, /obj/structure/cable{ icon_state = "4-8" }, @@ -3092,14 +3095,10 @@ /turf/template_noop, /area/template_noop) "BC" = ( -/obj/structure/filingcabinet/double, /obj/structure/sign/poster/official/help_others{ pixel_y = 32 }, -/obj/effect/turf_decal/corner/transparent/inteqbrown/border{ - dir = 1 - }, -/turf/open/floor/plasteel, +/turf/closed/wall/mineral/plastitanium, /area/ship/crew/office) "BL" = ( /obj/effect/turf_decal/corner/opaque/brown{ @@ -3592,10 +3591,11 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Gm" = ( +/obj/effect/turf_decal/corner/transparent/inteqbrown/half, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-4" }, -/obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plasteel, /area/ship/crew/office) "Go" = ( @@ -4671,8 +4671,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/corner/transparent/inteqbrown/half, +/obj/structure/chair/office, /turf/open/floor/plasteel, /area/ship/crew/office) "Qw" = ( @@ -4754,7 +4754,26 @@ /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "Rh" = ( -/turf/closed/wall/mineral/plastitanium, +/obj/structure/sign/poster/official/safety_report{ + pixel_x = 32 + }, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 4 + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/yellow{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/box/ammo/c9mm_rubber{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/storage/box/ammo/c9mm{ + pixel_x = -2; + pixel_y = 2 + }, +/turf/open/floor/plasteel/dark, /area/ship/security) "RA" = ( /obj/item/storage/backpack/messenger/inteq, @@ -4834,6 +4853,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "Sh" = ( @@ -5073,15 +5093,10 @@ /obj/effect/turf_decal/corner/opaque/brown{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/structure/rack, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/storage/box/ammo/c9mm_rubber, -/obj/item/storage/box/ammo/c9mm, /obj/machinery/light/small/directional/north, -/obj/structure/sign/poster/official/safety_report{ - pixel_x = 32 - }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, /turf/open/floor/plasteel/dark, /area/ship/security) "Vy" = ( @@ -5897,7 +5912,7 @@ SL (11,1,1) = {" Zu Rh -Rh +jN Zu uB ua @@ -5930,8 +5945,8 @@ SL (12,1,1) = {" tZ BC -jN -lN +oO +oO gh zs fN @@ -5997,7 +6012,7 @@ SL tZ mG Qo -tZ +lN An Sd HC diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 662ce9c5e3d6..9ea8b60d9b89 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -51,12 +51,13 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "bg" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/box/corners{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/stairs, +/obj/structure/weightmachine/weightlifter, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "bi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -72,6 +73,19 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) +"bl" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/machinery/iv_drip, +/obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/turf/open/floor/plasteel/patterned/brushed, +/area/ship/medical) "bn" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -87,14 +101,13 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/maintenance/port) "bq" = ( -/obj/effect/turf_decal/box/corners, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, /obj/item/trash/energybar, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "bt" = ( @@ -110,7 +123,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/plasteel/grimy, /area/ship/crew) "bz" = ( @@ -136,12 +148,15 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "bL" = ( -/obj/structure/bed, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/brown, /obj/structure/sign/poster/clip/lanchester{ pixel_y = -32 }, +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/black, /area/ship/crew) "ce" = ( @@ -173,12 +188,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/ship/security) -"dq" = ( -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 +"cH" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/plasteel/tech, +/area/ship/security) +"dq" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) @@ -268,9 +288,6 @@ /obj/item/gun/ballistic/automatic/pistol/commander/inteq{ pixel_y = -5 }, -/obj/structure/sign/poster/contraband/peacemaker{ - pixel_x = 32 - }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech/grid, /area/ship/security) @@ -323,6 +340,7 @@ dir = 10 }, /obj/effect/decal/cleanable/oil/streak, +/obj/effect/turf_decal/box/corners, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "fI" = ( @@ -344,7 +362,7 @@ /area/ship/security) "fJ" = ( /turf/closed/wall/mineral/plastitanium, -/area/ship/security) +/area/ship/medical) "fV" = ( /obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ @@ -362,6 +380,13 @@ /obj/structure/railing/corner, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"fZ" = ( +/obj/structure/marker_beacon{ + picked_color = "Yellow" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) "gh" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/corner/opaque/brown{ @@ -385,27 +410,11 @@ /obj/effect/turf_decal/industrial/traffic{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/button/shieldwallgen{ - dir = 1; - id = "vaquero_cargo"; - pixel_x = 5; - pixel_y = -19 - }, -/obj/machinery/button/door{ - dir = 1; - id = "vaquero_cargo"; - name = "Cargo Door Control"; - pixel_x = -4; - pixel_y = -20 + dir = 4 }, -/obj/effect/turf_decal/industrial/caution{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) @@ -425,17 +434,9 @@ /obj/item/pickaxe/mini, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/thinplating/dark, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel/tech, /area/ship/cargo) -"gO" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/warning, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) "gY" = ( /obj/structure/table/reinforced, /obj/item/spacecash/bundle/c500, @@ -568,13 +569,12 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "if" = ( -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel/patterned, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/airalarm/directional/east, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/turf/open/floor/plasteel/tech, /area/ship/cargo) "iu" = ( /obj/structure/cable{ @@ -658,6 +658,9 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "jg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /turf/open/floor/carpet/black, /area/ship/crew) "jw" = ( @@ -702,12 +705,9 @@ /turf/open/floor/plasteel/dark, /area/ship/bridge) "jE" = ( -/obj/structure/bed, -/obj/structure/curtain/bounty, -/obj/item/bedsheet/brown, -/obj/machinery/light/small/directional/east, -/obj/machinery/airalarm/directional/north, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, /turf/open/floor/carpet/black, /area/ship/crew) "jI" = ( @@ -814,7 +814,7 @@ /obj/item/clothing/suit/space/inteq, /obj/item/clothing/head/helmet/space/inteq, /obj/effect/turf_decal/siding/thinplating/dark, -/obj/item/radio/intercom/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/plasteel/tech, /area/ship/cargo) "lm" = ( @@ -862,16 +862,23 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "lL" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/machinery/iv_drip, -/obj/machinery/light/small/directional/south, -/obj/item/radio/intercom/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 5 }, /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 6 }, +/obj/structure/bed, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "lU" = ( @@ -934,7 +941,6 @@ /obj/machinery/suit_storage_unit/inherit, /obj/item/clothing/suit/space/inteq, /obj/item/clothing/head/helmet/space/inteq, -/obj/machinery/airalarm/directional/east, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/tech, @@ -957,10 +963,22 @@ /obj/effect/turf_decal/trimline/opaque/yellow/warning{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) "nm" = ( +/obj/docking_port/mobile{ + dir = 2; + launch_status = 0; + port_direction = 8; + preferred_direction = 4 + }, +/obj/machinery/porta_turret/ship/inteq{ + dir = 5; + id = "vaquero_grid" + }, /turf/closed/wall/mineral/plastitanium, /area/ship/medical) "ox" = ( @@ -1073,12 +1091,21 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/crew/office) "qE" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + id = "vaquero_cargo"; + locked = 1 + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "vaquero_cargo" + }, +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/cargo) "qQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1130,6 +1157,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/light/small/directional/east, /obj/item/trash/chips, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 20; + pixel_y = -10 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "rD" = ( @@ -1143,6 +1175,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/orange, /area/ship/bridge) +"rP" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/warning{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) "sm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1270,11 +1309,29 @@ }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security) +"vs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/box/corners, +/obj/structure/closet/crate, +/obj/item/stack/sheet/glass/twenty, +/obj/item/stack/sheet/metal/twenty, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) +"vw" = ( +/obj/structure/marker_beacon{ + picked_color = "Yellow" + }, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) "vN" = ( /turf/open/floor/plasteel/patterned, /area/ship/cargo) "vT" = ( /obj/effect/turf_decal/trimline/opaque/yellow/warning, +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) "vU" = ( @@ -1307,20 +1364,17 @@ /turf/template_noop, /area/template_noop) "wy" = ( -/obj/effect/turf_decal/box/corners, -/obj/structure/closet/crate, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/glass/twenty, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "wI" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, /obj/structure/weightmachine/weightlifter, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "wU" = ( @@ -1485,27 +1539,23 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "zr" = ( -/obj/effect/turf_decal/industrial/traffic{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 + dir = 5 }, -/obj/machinery/light/directional/east, +/obj/effect/turf_decal/box/corners, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "zG" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/warning{ - dir = 1 - }, -/obj/effect/turf_decal/industrial/warning{ - dir = 8 +/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/machinery/door/poddoor{ + dir = 4; + id = "vaquero_cargo" }, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/cargo) "zM" = ( /obj/machinery/power/terminal{ dir = 8 @@ -1586,13 +1636,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/newscaster/directional/south, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Am" = ( @@ -1666,22 +1715,33 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "Bj" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/turf/open/floor/engine/hull/reinforced, -/area/ship/external/dark) -"Bl" = ( +/obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/corner/opaque/yellow, -/obj/effect/turf_decal/corner/opaque/brown{ - dir = 8 + icon_state = "0-8" }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/plasteel/dark, -/area/ship/security) +/obj/machinery/power/shieldwallgen/atmos{ + anchored = 1; + dir = 1; + id = "vaquero_cargo"; + locked = 1 + }, +/obj/machinery/door/poddoor{ + dir = 4; + id = "vaquero_cargo" + }, +/turf/open/floor/engine/hull/reinforced/interior, +/area/ship/cargo) +"Bl" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/corner/opaque/yellow, +/obj/effect/turf_decal/corner/opaque/brown{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/plasteel/dark, +/area/ship/security) "Bu" = ( /obj/structure/closet/wall/directional/north{ icon_door = "grey_wall" @@ -1756,6 +1816,19 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) +"Ch" = ( +/obj/effect/turf_decal/industrial/traffic{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "Ci" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -1771,12 +1844,13 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "Cl" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/machinery/door/poddoor{ - dir = 4; - id = "vaquero_cargo" +/obj/effect/turf_decal/industrial/traffic{ + dir = 8 }, -/turf/open/floor/engine/hull/reinforced/interior, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "Cq" = ( /turf/closed/wall/mineral/plastitanium, @@ -1874,7 +1948,6 @@ }, /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/firealarm/directional/south, -/obj/item/radio/intercom/directional/east, /turf/open/floor/plasteel/tech, /area/ship/security) "Dh" = ( @@ -1953,33 +2026,21 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Ex" = ( +/obj/structure/catwalk/over/plated_catwalk, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/door/airlock/medical/glass{ - dir = 4; - name = "Infirmary" - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/door/firedoor/border_only{ +/obj/structure/railing/corner{ dir = 8 }, -/turf/open/floor/plasteel/tech, -/area/ship/medical) +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "EB" = ( /obj/machinery/door/window/northleft{ dir = 8; @@ -2071,51 +2132,31 @@ /obj/machinery/computer/helm/viewscreen/directional/south, /turf/open/floor/plasteel/dark, /area/ship/crew/office) +"FO" = ( +/turf/closed/wall/mineral/plastitanium, +/area/ship/security) "Gq" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) "GB" = ( -/obj/machinery/door/airlock{ - name = "Dormitory" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 +/obj/structure/table, +/obj/item/flashlight/lamp/green, +/obj/machinery/newscaster/directional/west, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/carpet/black, /area/ship/crew) "GI" = ( -/obj/structure/weightmachine/weightlifter, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "GQ" = ( -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/under/syndicate/inteq, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/under/syndicate/inteq/skirt, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/shoes/sneakers/black, -/obj/structure/closet/wall/directional/north{ - icon_door = "orange_wall"; - name = "uniform closet" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/black, /area/ship/crew) "Ha" = ( @@ -2179,36 +2220,15 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/security) "HN" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - icon_door = "med_wall"; - name = "medical locker"; - req_access_txt = "5" - }, -/obj/item/storage/firstaid/regular{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/storage/firstaid/advanced{ - pixel_x = -6; - pixel_y = -3 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = 12 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -2230,7 +2250,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel/grimy, /area/ship/crew) "In" = ( @@ -2425,23 +2445,17 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/box/corners, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "LW" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - id = "vaquero_cargo"; - locked = 1 +/obj/effect/turf_decal/industrial/traffic{ + dir = 8 }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "vaquero_cargo" +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/engine/hull/reinforced/interior, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "Me" = ( /obj/structure/railing{ @@ -2521,12 +2535,19 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "NO" = ( -/obj/machinery/porta_turret/ship/inteq{ - dir = 6; - id = "vaquero_grid" +/obj/structure/railing, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/security) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/catwalk/over/plated_catwalk, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "NR" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2642,21 +2663,20 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "Pn" = ( -/obj/effect/turf_decal/industrial/warning/fulltile, +/obj/effect/turf_decal/industrial/traffic/corner{ + dir = 1 + }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-8" }, -/obj/machinery/power/shieldwallgen/atmos{ - anchored = 1; - dir = 1; - id = "vaquero_cargo"; - locked = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/door/poddoor{ - dir = 4; - id = "vaquero_cargo" +/obj/structure/sign/warning/incident{ + pixel_y = -30 }, -/turf/open/floor/engine/hull/reinforced/interior, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/patterned, /area/ship/cargo) "Pp" = ( /obj/machinery/power/smes/engineering, @@ -2672,23 +2692,40 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "PD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/closet/secure_closet/wall/directional/north{ + icon_door = "med_wall"; + name = "medical locker"; + req_access_txt = "5" }, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = 10 +/obj/item/storage/firstaid/regular{ + pixel_x = 6; + pixel_y = 3 }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 5 +/obj/item/storage/firstaid/toxin{ + pixel_x = 2; + pixel_y = 1 }, -/obj/effect/turf_decal/steeldecal/steel_decals10{ - dir = 6 +/obj/item/storage/firstaid/fire{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/storage/firstaid/advanced{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = 12 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, -/obj/structure/bed, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "Qy" = ( @@ -2791,26 +2828,45 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "RU" = ( -/obj/structure/dresser, -/obj/machinery/firealarm/directional/west, /obj/item/radio/intercom/directional/south, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/west, +/obj/structure/closet/wardrobe/orange{ + name = "uniform wardrobe"; + populate = 0 + }, +/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/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, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, /turf/open/floor/carpet/black, /area/ship/crew) "RX" = ( /obj/structure/catwalk/over/plated_catwalk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, +/obj/structure/railing, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Sc" = ( @@ -2830,6 +2886,9 @@ /area/ship/hallway/central) "Tc" = ( /obj/structure/ore_box, +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ti" = ( @@ -2843,11 +2902,9 @@ /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "Tn" = ( -/obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/inteq, -/obj/item/clothing/head/helmet/space/inteq, /obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/rack, /turf/open/floor/plasteel/tech, /area/ship/cargo) "TC" = ( @@ -2859,8 +2916,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/turretid/ship{ - pixel_y = 26; - id = "vaquero_grid" + id = "vaquero_grid"; + pixel_y = 26 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -2905,62 +2962,58 @@ /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, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, /turf/open/floor/carpet/black, /area/ship/crew) "Ul" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) "Ur" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +/obj/structure/closet/wardrobe/orange{ + name = "uniform wardrobe"; + populate = 0 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/under/syndicate/inteq, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/under/syndicate/inteq/skirt, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/shoes/sneakers/black, +/turf/open/floor/carpet/black, +/area/ship/crew) +"Uy" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/dresser{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 }, -/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/inteq{ - dir = 5; - id = "vaquero_grid" +/obj/structure/railing{ + dir = 8 }, -/turf/closed/wall/mineral/plastitanium, -/area/ship/medical) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel/stairs, +/area/ship/cargo) "UV" = ( /obj/machinery/door/airlock/public/glass{ dir = 4; @@ -3042,13 +3095,24 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"VZ" = ( +/obj/machinery/porta_turret/ship/inteq{ + dir = 6; + id = "vaquero_grid" + }, +/turf/closed/wall/mineral/plastitanium, +/area/ship/security) "Wd" = ( -/obj/structure/marker_beacon{ - picked_color = "Yellow" +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) +"Wl" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/warning, +/turf/open/floor/engine/hull/reinforced, +/area/ship/external/dark) "WH" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ name = "exhaust injector" @@ -3057,9 +3121,6 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) "WM" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, /obj/structure/closet/crate, /obj/item/target/syndicate{ pixel_x = -5; @@ -3076,6 +3137,9 @@ pixel_y = 5 }, /obj/item/clothing/ears/earmuffs, +/obj/effect/turf_decal/box/corners{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Xb" = ( @@ -3110,26 +3174,38 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "Xi" = ( -/obj/structure/marker_beacon{ - picked_color = "Yellow" +/obj/effect/turf_decal/industrial/warning{ + dir = 8 }, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) "Xo" = ( /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/machinery/door/airlock/medical/glass{ + dir = 4; + name = "Infirmary" }, -/obj/effect/turf_decal/siding/thinplating/dark{ +/obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 1 }, -/turf/open/floor/plasteel/patterned/brushed, +/obj/effect/turf_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, /area/ship/medical) "XD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, @@ -3154,6 +3230,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ship/maintenance/port) +"XL" = ( +/obj/structure/sign/poster/contraband/peacemaker{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/inherit, +/obj/item/clothing/suit/space/hardsuit/security/independent/inteq, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech/grid, +/area/ship/security) "XO" = ( /obj/structure/closet/secure_closet/freezer{ anchored = 1; @@ -3248,19 +3339,31 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "Zh" = ( -/obj/effect/turf_decal/industrial/traffic/corner{ +/obj/effect/turf_decal/industrial/traffic{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/sign/warning/incident{ - pixel_y = -30 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/button/shieldwallgen{ + dir = 1; + id = "vaquero_cargo"; + pixel_x = 5; + pixel_y = -19 + }, +/obj/machinery/button/door{ + dir = 1; + id = "vaquero_cargo"; + name = "Cargo Door Control"; + pixel_x = -4; + pixel_y = -20 + }, +/obj/effect/turf_decal/industrial/caution{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Zi" = ( @@ -3347,14 +3450,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 5; - pixel_y = -20 - }, -/obj/structure/extinguisher_cabinet/directional/south{ - pixel_x = -6 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/ship/crew) @@ -3656,7 +3751,7 @@ VI Ul VD Ag -Gq +GQ GQ Uf LB @@ -3676,7 +3771,7 @@ jB Ul sS bu -Gq +TX TX jg LB @@ -3696,7 +3791,7 @@ TQ Ul rA ZA -Gq +Uy jE bL Gq @@ -3786,7 +3881,7 @@ ww ww QJ kW -mR +NO wI bq vN @@ -3809,9 +3904,9 @@ mE RX bg zr -if -dq +vN dq +vs Zh te Ci @@ -3824,11 +3919,11 @@ ww (23,1,1) = {" ww ww -nm -lo +Eh +if Ex -lo -lo +UO +Ch LW Cl Cl @@ -3837,27 +3932,27 @@ te te OK te -fJ +te ww ww "} (24,1,1) = {" ww ww -ww +fJ lo Xo -PD +lo lo qE zG -gO +zG Bj te Hw fI te -ww +FO ww ww "} @@ -3885,7 +3980,27 @@ ww ww ww ww -UO +lo +PD +bl +lo +fZ +rP +Wl +vw +te +XL +cH +te +ww +ww +ww +"} +(27,1,1) = {" +ww +ww +ww +nm lo lo lo @@ -3896,7 +4011,7 @@ ww te te te -NO +VZ ww ww ww diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm index 7791494023f4..f749f60f7e52 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm @@ -8222,10 +8222,6 @@ }, /turf/open/floor/plasteel, /area/ship/security/prison) -"Wi" = ( -/obj/structure/statue/sandstone/assistant, -/turf/open/floor/plating, -/area/ship/maintenance/fore) "Wj" = ( /obj/effect/decal/cleanable/food/salt, /obj/effect/turf_decal/siding/wideplating/light, @@ -10035,7 +10031,7 @@ rc bb yI yI -Wi +yI CP nK jY @@ -10115,7 +10111,7 @@ rW bb yI yI -Wi +yI CP nK jY diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index b5d8210c802f..d2e0505b3583 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -40,5 +40,6 @@ SUBSYSTEM_DEF(mobs) L.Life(seconds, times_fired) else GLOB.mob_living_list.Remove(L) + stack_trace("[L] no longer exists in mob_living_list") if (MC_TICK_CHECK) return diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 79326ab9e2ad..7a1f7a36283a 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -540,7 +540,7 @@ var/previous_virtual_z = OldLoc?.virtual_z() || 0 var/current_virtual_z = virtual_z() - if(current_virtual_z && current_virtual_z != previous_virtual_z) + if(current_virtual_z != previous_virtual_z) on_virtual_z_change(current_virtual_z, previous_virtual_z) SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, OldLoc, Dir, Forced, old_locs) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index b54c192f4407..abee7fe954f7 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -46,11 +46,15 @@ return ..() /obj/machinery/navbeacon/on_virtual_z_change(new_virtual_z, previous_virtual_z) + ..() + if(!codes) + return + if(!codes["patrol"]) + return if(previous_virtual_z) LAZYREMOVEASSOC(GLOB.navbeacons, "[previous_virtual_z]", src) if(new_virtual_z) LAZYADDASSOCLIST(GLOB.navbeacons, "[new_virtual_z]", src) - ..() // set the transponder codes assoc list from codes_txt /obj/machinery/navbeacon/proc/set_codes() @@ -71,7 +75,10 @@ codes[e] = "1" /obj/machinery/navbeacon/proc/glob_lists_deregister() - LAZYREMOVE(GLOB.navbeacons["[virtual_z()]"], src) + if(!codes) + return + if(codes["patrol"]) + LAZYREMOVE(GLOB.navbeacons["[virtual_z()]"], src) GLOB.deliverybeacons -= src GLOB.deliverybeacontags -= location GLOB.wayfindingbeacons -= src diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index af7addd21a95..13d6268c1520 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -571,6 +571,7 @@ /obj/machinery/smartfridge/food = "food", /obj/machinery/smartfridge/drinks = "drinks", /obj/machinery/smartfridge/extract = "slimes", + /obj/machinery/smartfridge/bloodbank = "blood", /obj/machinery/smartfridge/organ = "organs", /obj/machinery/smartfridge/chemistry = "chems", /obj/machinery/smartfridge/chemistry/virology = "viruses", diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 23a8c8d5e5f0..08dd06b690d5 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \ null, \ new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ - new/datum/stack_recipe(" reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \ + new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \ new/datum/stack_recipe("glass shard", /obj/item/shard, 1) \ )) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 75c863bee5b6..5f4ede1dbe14 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -11,14 +11,6 @@ singular_name = "human skin piece" novariants = FALSE -GLOBAL_LIST_INIT(human_recipes, list( \ - new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5), \ - )) - -/obj/item/stack/sheet/animalhide/human/get_main_recipes() - . = ..() - . += GLOB.human_recipes - /obj/item/stack/sheet/animalhide/generic name = "skin" desc = "A piece of skin." @@ -32,12 +24,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \ icon_state = "sheet-corgi" item_state = "sheet-corgi" - -GLOBAL_LIST_INIT(gondola_recipes, list ( \ - new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \ - new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \ - )) - /obj/item/stack/sheet/animalhide/mothroach name = "mothroach hide" desc = "A thin layer of mothroach hide." @@ -53,10 +39,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \ icon_state = "sheet-gondola" item_state = "sheet-gondola" -/obj/item/stack/sheet/animalhide/gondola/get_main_recipes() - . = ..() - . += GLOB.gondola_recipes - /obj/item/stack/sheet/animalhide/cat name = "cat hide" desc = "The by-product of cat farming." @@ -71,14 +53,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \ icon_state = "sheet-monkey" item_state = "sheet-monkey" -GLOBAL_LIST_INIT(monkey_recipes, list ( \ - new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \ - )) - -/obj/item/stack/sheet/animalhide/monkey/get_main_recipes() - . = ..() - . += GLOB.monkey_recipes - /obj/item/stack/sheet/animalhide/lizard name = "lizard skin" desc = "Sssssss..." diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 560031fa03da..833360f52fa8 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -26,7 +26,6 @@ Mineral Sheets GLOBAL_LIST_INIT(sandstone_recipes, list ( \ new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1) \ )) @@ -108,9 +107,6 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \ - new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/diamond/get_main_recipes() @@ -146,7 +142,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \ new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/uranium/get_main_recipes() @@ -186,7 +181,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \ GLOBAL_LIST_INIT(plasma_recipes, list ( \ new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \ - new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/plasma/get_main_recipes() @@ -240,12 +234,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \ new/datum/stack_recipe("chemical crate", /obj/structure/closet/crate/chem, 1, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \ new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1), \ - new/datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("HOP Statue", /obj/structure/statue/gold/head_of_personnel, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \ - new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/gold/get_main_recipes() @@ -296,11 +285,6 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \ GLOBAL_LIST_INIT(silver_recipes, list ( \ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \ - new/datum/stack_recipe("Med Officer Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/silver/get_main_recipes() diff --git a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm index 9819a941e5f8..bd2a13a1ac88 100644 --- a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm +++ b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm @@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \ + new/datum/stack_recipe("voting box", /obj/structure/votebox, 5, time = 50), \ new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \ new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \ new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \ diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ce64af1fd205..790c9cb2d22d 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -346,8 +346,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ */ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new/datum/stack_recipe("box", /obj/item/storage/box), \ - new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ - new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ null, \ @@ -452,7 +450,6 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \ null, new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/tile/bronze diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 68c99d6649a5..4d9b3b783cef 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -62,11 +62,6 @@ desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour." icon_state = "nuke" -/obj/structure/statue/uranium/eng - name = "Statue of an engineer" - desc = "This statue has a sickening green colour." - icon_state = "eng" - /obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params) radiate() return ..() @@ -93,168 +88,6 @@ return return -////////////////////////////plasma/////////////////////////////////////////////////////////////////////// - -/obj/structure/statue/plasma - max_integrity = 200 - material_drop_type = /obj/item/stack/sheet/mineral/plasma - impressiveness = 20 - desc = "This statue is suitably made from plasma." - -/obj/structure/statue/plasma/scientist - name = "statue of a scientist" - icon_state = "sci" - -/obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) - if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) - - -/obj/structure/statue/plasma/bullet_act(obj/projectile/Proj) - var/burn = FALSE - if(!(Proj.nodamage) && Proj.damage_type == BURN && !QDELETED(src)) - burn = TRUE - if(burn) - var/turf/T = get_turf(src) - if(Proj.firer) - message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(Proj.firer)] in [ADMIN_VERBOSEJMP(T)]") - log_game("Plasma statue ignited by [key_name(Proj.firer)] in [AREACOORD(T)]") - else - message_admins("Plasma statue ignited by [Proj]. No known firer, in [ADMIN_VERBOSEJMP(T)]") - log_game("Plasma statue ignited by [Proj] in [AREACOORD(T)]. No known firer.") - PlasmaBurn(2500) - . = ..() - -/obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params) - if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite - var/turf/T = get_turf(src) - message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") - log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]") - ignite(W.get_temperature()) - else - return ..() - -/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature) - if(QDELETED(src)) - return - atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]") - deconstruct(FALSE) - -/obj/structure/statue/plasma/proc/ignite(exposed_temperature) - if(exposed_temperature > 300) - PlasmaBurn(exposed_temperature) - -//////////////////////gold/////////////////////////////////////// - -/obj/structure/statue/gold - max_integrity = 300 - material_drop_type = /obj/item/stack/sheet/mineral/gold - impressiveness = 25 - desc = "This is a highly valuable statue made from gold." - -/obj/structure/statue/gold/hos - name = "statue of the head of security" - icon_state = "hos" - -/obj/structure/statue/gold/head_of_personnel - name = "statue of the head of personnel" - icon_state = "hop" - -/obj/structure/statue/gold/cmo - name = "statue of the chief medical officer" - icon_state = "cmo" - -/obj/structure/statue/gold/ce - name = "statue of the chief engineer" - icon_state = "ce" - -/obj/structure/statue/gold/rd - name = "statue of the research director" - icon_state = "rd" - -//////////////////////////silver/////////////////////////////////////// - -/obj/structure/statue/silver - max_integrity = 300 - material_drop_type = /obj/item/stack/sheet/mineral/silver - impressiveness = 25 - desc = "This is a valuable statue made from silver." - -/obj/structure/statue/silver/md - name = "statue of a medical officer" - icon_state = "md" - -/obj/structure/statue/silver/janitor - name = "statue of a janitor" - icon_state = "jani" - -/obj/structure/statue/silver/sec - name = "statue of a security officer" - icon_state = "sec" - -/obj/structure/statue/silver/secborg - name = "statue of a security cyborg" - icon_state = "secborg" - -/obj/structure/statue/silver/medborg - name = "statue of a medical cyborg" - icon_state = "medborg" - -/////////////////////////diamond///////////////////////////////////////// - -/obj/structure/statue/diamond - max_integrity = 1000 - material_drop_type = /obj/item/stack/sheet/mineral/diamond - impressiveness = 50 - desc = "This is a very expensive diamond statue." - -/obj/structure/statue/diamond/captain - name = "statue of THE captain." - icon_state = "cap" - -/obj/structure/statue/diamond/ai1 - name = "statue of the AI hologram." - icon_state = "ai1" - -/obj/structure/statue/diamond/ai2 - name = "statue of the AI core." - icon_state = "ai2" - -////////////////////////bananium/////////////////////////////////////// - -/obj/structure/statue/bananium - max_integrity = 300 - material_drop_type = /obj/item/stack/sheet/mineral/hidden/hellstone - impressiveness = 50 - desc = "A bananium statue with a small engraving:'HOOOOOOONK'." - var/spam_flag = 0 - -/obj/structure/statue/bananium/clown - name = "statue of a clown" - icon_state = "clown" - -/obj/structure/statue/bananium/Bumped(atom/movable/AM) - honk() - ..() - -/obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params) - honk() - return ..() - -/obj/structure/statue/bananium/attack_hand(mob/user) - honk() - . = ..() - -/obj/structure/statue/bananium/attack_paw(mob/user) - honk() - ..() - -/obj/structure/statue/bananium/proc/honk() - if(!spam_flag) - spam_flag = TRUE - playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE) - addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS) - /////////////////////sandstone///////////////////////////////////////// /obj/structure/statue/sandstone @@ -262,12 +95,6 @@ material_drop_type = /obj/item/stack/sheet/mineral/sandstone impressiveness = 15 -/obj/structure/statue/sandstone/assistant - name = "statue of an assistant" - desc = "A cheap statue of sandstone for a greyshirt." - icon_state = "assist" - - /obj/structure/statue/sandstone/venus //call me when we add marble i guess name = "statue of a pure maiden" desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though." @@ -290,16 +117,6 @@ desc = "Looks like that weird kid with the tiger plushie has been round here again." icon_state = "snowlegion" -///////////////////////////////bronze/////////////////////////////////// - -/obj/structure/statue/bronze - material_drop_type = /obj/item/stack/tile/bronze - -/obj/structure/statue/bronze/marx - name = "\improper Karl Marx bust" - desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector." - icon_state = "marx" - /// bone /obj/structure/statue/bone anchored = TRUE diff --git a/code/modules/mining/drill.dm b/code/modules/mining/drill.dm index 9a35c2b4bf11..c327efab39a8 100644 --- a/code/modules/mining/drill.dm +++ b/code/modules/mining/drill.dm @@ -344,6 +344,8 @@ //Overly long proc to handle the unique properties for each malfunction type /obj/machinery/drill/proc/malfunction(malfunction_type) + if(active) + mining.toggle_spawning() //turns mob spawning off after a malfunction switch(malfunction_type) if(MALF_LASER) say("Malfunction: Laser array damaged, please replace before continuing mining operations.") diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 85c60a15b031..490efbbabef8 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -96,18 +96,17 @@ INITIALIZE_IMMEDIATE(/mob/dead) return /mob/dead/Destroy() - for(var/level in SSmobs.dead_players_by_virtual_z) - LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, level, src) - // Forgive me for this one. This loop can be replaced by the line below by the one brave enough to fix - // observers not cleanly removing themselves from the dead_players_by_virtual_z /list when they should - //LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src) + //Observers should no longer be duplicating themselves across virtual z so it SHOULD be fine to only check its virtual z. + LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src) return ..() /mob/dead/Login() . = ..() if(!client) return - LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src) + var/virt_z = virtual_z() + if(virt_z) + LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virt_z]", src) /mob/dead/Logout() . = ..() diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 62098a940937..18ddbe375da9 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -18,8 +18,9 @@ var/virtual_z = virtual_z() - LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src) - SSidlenpcpool.try_wakeup_virtual_z(virtual_z) + if(virtual_z) + LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src) + SSidlenpcpool.try_wakeup_virtual_z(virtual_z) //Vents if(ventcrawler) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 3670e14a6405..55ea24c81d7d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -630,30 +630,29 @@ GLOB.simple_animals[togglestatus] += list(src) AIStatus = togglestatus - var/virt_z = "[virtual_z()]" + var/virt_z = virtual_z() if(!virt_z) return switch(togglestatus) if(AI_Z_OFF) - LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src) - + LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src) else - LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src) + LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src) /mob/living/simple_animal/proc/check_should_sleep() if (pulledby || shouldwakeup) toggle_ai(AI_ON) return - var/virt_z = "[virtual_z()]" - if(!virt_z) - return - var/players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, virt_z) - if(!length(players_on_virtual_z)) - toggle_ai(AI_Z_OFF) - else if(AIStatus == AI_Z_OFF) - toggle_ai(AI_ON) + var/virt_z = virtual_z() + var/players_on_virtual_z = 0 + if(virt_z) + players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, "[virt_z]") + if(!length(players_on_virtual_z)) + toggle_ai(AI_Z_OFF) + else if(AIStatus == AI_Z_OFF) + toggle_ai(AI_ON) /mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() @@ -665,6 +664,7 @@ . = ..() if(previous_virtual_z) LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[previous_virtual_z]", src) - toggle_ai(initial(AIStatus)) + if(QDELETED(src)) + return if(new_virtual_z) check_should_sleep() diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm index ff82cd185fb2..eea549fb7475 100644 --- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @@ -30,7 +30,7 @@ if(!iscarbon(M)) var/mob/living/simple_animal/hostile/hostile_target = M var/hostile_ai_status = hostile_target.AIStatus - hostile_target.AIStatus = AI_OFF + hostile_target.toggle_ai(AI_OFF) addtimer(VARSET_CALLBACK(hostile_target, AIStatus, hostile_ai_status),reac_volume) M.Jitter(3 * reac_volume) M.Dizzy(2 * reac_volume) diff --git a/html/changelogs/AutoChangeLog-pr-3361.yml b/html/changelogs/AutoChangeLog-pr-3361.yml new file mode 100644 index 000000000000..94fa273582c6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3361.yml @@ -0,0 +1,4 @@ +author: FalloutFalcon +changes: + - {bugfix: ghosts cannot duplicate themselves across multiple z levels.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3446.yml b/html/changelogs/AutoChangeLog-pr-3446.yml new file mode 100644 index 000000000000..65e0eb3677b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3446.yml @@ -0,0 +1,5 @@ +author: firebudgy +changes: + - {bugfix: 'Mudskipper windows are correctly reinforced, like other ships by the + same manufacturer.'} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3508.yml b/html/changelogs/AutoChangeLog-pr-3508.yml new file mode 100644 index 000000000000..84fc1ea2deca --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3508.yml @@ -0,0 +1,4 @@ +author: Apogee-dev +changes: + - {balance: Valor and Vaquero have combat hardsuits for their enforcers now} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3539.yml b/html/changelogs/AutoChangeLog-pr-3539.yml new file mode 100644 index 000000000000..4f995cda3c61 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3539.yml @@ -0,0 +1,6 @@ +author: Sadhorizon +changes: + - {rscdel: Removed Karl Marx from the game.} + - {rscdel: Removed all the job statues.} + - {rscdel: 'Cardborg suit, human, gondola and monkey skinsuits are no longer craftable.'} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3541.yml b/html/changelogs/AutoChangeLog-pr-3541.yml new file mode 100644 index 000000000000..4bc25ce2336d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3541.yml @@ -0,0 +1,4 @@ +author: Sadhorizon +changes: + - {bugfix: Pubby ruin can no longer randomly have acid in airlocks.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3543.yml b/html/changelogs/AutoChangeLog-pr-3543.yml new file mode 100644 index 000000000000..2a4d5afad200 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3543.yml @@ -0,0 +1,4 @@ +author: Gristlebee +changes: + - {bugfix: Fixes walls and an enemy spawn in the Wrecked Factory} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3546.yml b/html/changelogs/AutoChangeLog-pr-3546.yml new file mode 100644 index 000000000000..e04b2efd4af6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3546.yml @@ -0,0 +1,5 @@ +author: Anticept +changes: + - {bugfix: blood smart-fridge selectable on smartfridge boards now when screwdrivering + them.} +delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-3551.yml b/html/changelogs/AutoChangeLog-pr-3551.yml new file mode 100644 index 000000000000..232c81139fdb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3551.yml @@ -0,0 +1,4 @@ +author: zimon9 +changes: + - {bugfix: fixed fauna spawning after drill malfunctions} +delete-after: true diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index cfb783ef1b10..7e9be0eed189 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ