diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index 6c6378c3e3c..08c11022d5e 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -2574,7 +2574,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/canister_frame/machine, +/obj/structure/fluff/broken_canister_frame, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "Tr" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index c419c508a1b..803e0afa28c 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -575,7 +575,7 @@ "xy" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/large, -/obj/structure/canister_frame/machine/finished_canister_frame, +/obj/structure/fluff/broken_canister_frame, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index f64cb52c71d..52cfe31d2b8 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -32,6 +32,10 @@ /obj/structure/alien/weeds, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/infested_frigate) +"aB" = ( +/obj/item/shard, +/turf/template_noop, +/area/template_noop) "aV" = ( /obj/machinery/light/small/red/dim/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -75,6 +79,12 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +"be" = ( +/obj/structure/broken_flooring/plating/directional/east, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent, +/turf/template_noop, +/area/template_noop) "bD" = ( /obj/effect/decal/cleanable/blood/gibs{ icon_state = "gib3-old"; @@ -123,13 +133,6 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"ce" = ( -/obj/structure/closet/crate/trashcart, -/obj/item/clothing/mask/facehugger/toy, -/obj/item/storage/fancy/cigarettes/cigpack_cannabis, -/obj/effect/mob_spawn/corpse/human/charredskeleton, -/turf/template_noop, -/area/template_noop) "cj" = ( /obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear, /obj/effect/decal/cleanable/blood/gibs{ @@ -417,6 +420,9 @@ /obj/item/ammo_casing/spent, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"fl" = ( +/turf/template_noop, +/area/template_noop) "fr" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -445,6 +451,10 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/infested_frigate) +"fM" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/template_noop, +/area/template_noop) "fX" = ( /obj/structure/toilet{ dir = 4 @@ -454,26 +464,10 @@ /obj/effect/spawner/random/entertainment/drugs, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"gH" = ( -/obj/effect/turf_decal{ - icon_state = "warningline_white"; - dir = 1 - }, -/obj/item/storage/toolbox/ammobox/strilka310{ - pixel_y = 16; - pixel_x = 5 - }, -/obj/item/storage/toolbox/ammobox/strilka310{ - pixel_y = 8; - pixel_x = 3 - }, -/obj/item/storage/box/handcuffs{ - pixel_y = 2; - pixel_x = -8 - }, -/obj/structure/table/glass/plasmaglass, -/turf/open/floor/pod/dark, -/area/ruin/space/has_grav/infested_frigate) +"gG" = ( +/obj/effect/spawner/random/trash/food_packaging, +/turf/template_noop, +/area/template_noop) "gW" = ( /obj/effect/turf_decal{ dir = 4 @@ -644,9 +638,6 @@ }, /turf/open/floor/mineral/plastitanium/airless, /area/ruin/space/has_grav/infested_frigate) -"jt" = ( -/turf/template_noop, -/area/template_noop) "jx" = ( /obj/effect/decal/cleanable/glass{ layer = 3.1 @@ -668,16 +659,6 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) -"kc" = ( -/obj/effect/turf_decal{ - dir = 8 - }, -/obj/effect/decal/cleanable/robot_debris/limb, -/obj/structure/canister_frame/machine, -/obj/item/ammo_casing/spent, -/obj/item/ammo_casing/spent, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/infested_frigate) "kg" = ( /obj/effect/decal/cleanable/blood/gibs{ icon_state = "drip1" @@ -686,6 +667,16 @@ /obj/item/ammo_casing/spent, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"kh" = ( +/obj/effect/turf_decal{ + dir = 8 + }, +/obj/effect/decal/cleanable/robot_debris/limb, +/obj/structure/fluff/broken_canister_frame, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/infested_frigate) "ki" = ( /obj/effect/turf_decal/tile/bar, /turf/closed/wall/mineral/plastitanium, @@ -710,13 +701,6 @@ /obj/machinery/vending/boozeomat/syndicate_access, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/infested_frigate) -"kL" = ( -/obj/structure/broken_flooring/plating/directional/north, -/obj/item/ammo_casing/spent, -/obj/item/ammo_casing/spent, -/obj/item/ammo_casing/spent, -/turf/template_noop, -/area/template_noop) "kS" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -753,10 +737,6 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"lp" = ( -/obj/effect/spawner/random/trash/food_packaging, -/turf/template_noop, -/area/template_noop) "lx" = ( /obj/structure/barricade/security, /obj/effect/decal/cleanable/blood/gibs{ @@ -766,11 +746,6 @@ /obj/machinery/light/red/dim/directional/north, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"lQ" = ( -/obj/structure/broken_flooring/plating/directional/north, -/obj/structure/broken_flooring/pile/directional/west, -/turf/template_noop, -/area/template_noop) "lU" = ( /obj/effect/decal/cleanable/blood/gibs{ icon_state = "u_madman_l" @@ -841,10 +816,6 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"nf" = ( -/obj/structure/broken_flooring/singular/directional/south, -/turf/template_noop, -/area/template_noop) "nk" = ( /obj/item/storage/medkit/o2, /obj/item/storage/medkit/toxin, @@ -872,10 +843,6 @@ }, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) -"no" = ( -/obj/structure/broken_flooring/pile/directional/south, -/turf/template_noop, -/area/template_noop) "nG" = ( /mob/living/simple_animal/hostile/alien{ faction = list("syndicate","xenomorph") @@ -981,6 +948,14 @@ /obj/item/ammo_casing/spent, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/infested_frigate) +"pq" = ( +/obj/structure/lattice, +/obj/item/storage/belt/bandolier{ + pixel_y = 2; + pixel_x = 15 + }, +/turf/template_noop, +/area/template_noop) "qb" = ( /obj/effect/turf_decal{ dir = 8 @@ -1047,6 +1022,17 @@ /obj/effect/decal/cleanable/plastic, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"qF" = ( +/obj/item/ammo_casing/spent, +/turf/template_noop, +/area/template_noop) +"qJ" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/clothing/mask/facehugger/toy, +/obj/item/storage/fancy/cigarettes/cigpack_cannabis, +/obj/effect/mob_spawn/corpse/human/charredskeleton, +/turf/template_noop, +/area/template_noop) "qR" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear, @@ -1125,6 +1111,10 @@ /obj/effect/decal/cleanable/plastic, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +"rO" = ( +/obj/structure/broken_flooring/pile/directional/south, +/turf/template_noop, +/area/template_noop) "so" = ( /obj/effect/mapping_helpers/broken_floor, /obj/item/broken_missile, @@ -1168,6 +1158,10 @@ /obj/item/clothing/mask/facehugger/dead, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) +"sT" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/template_noop) "sZ" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -1258,6 +1252,26 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"vo" = ( +/obj/effect/turf_decal{ + icon_state = "warningline_white"; + dir = 1 + }, +/obj/item/storage/toolbox/ammobox/strilka310{ + pixel_y = 16; + pixel_x = 5 + }, +/obj/item/storage/toolbox/ammobox/strilka310{ + pixel_y = 8; + pixel_x = 3 + }, +/obj/item/storage/box/handcuffs{ + pixel_y = 2; + pixel_x = -8 + }, +/obj/structure/table/glass/plasmaglass, +/turf/open/floor/pod/dark, +/area/ruin/space/has_grav/infested_frigate) "vx" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -1360,6 +1374,13 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"wq" = ( +/obj/structure/lattice, +/obj/item/stack/rods{ + amount = 25 + }, +/turf/template_noop, +/area/template_noop) "wt" = ( /obj/effect/turf_decal{ icon_state = "warningline_white"; @@ -1443,10 +1464,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/mineral/plastitanium/airless, /area/template_noop) -"xl" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/template_noop) "xo" = ( /obj/effect/decal/cleanable/glass, /obj/structure/cable, @@ -1573,12 +1590,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"yF" = ( -/obj/item/stack/rods{ - amount = 23 - }, -/turf/template_noop, -/area/template_noop) "yG" = ( /obj/effect/decal/cleanable/robot_debris{ icon_state = "gib4" @@ -1590,14 +1601,6 @@ /obj/effect/decal/cleanable/plastic, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/infested_frigate) -"yI" = ( -/obj/structure/lattice, -/obj/item/storage/belt/bandolier{ - pixel_y = 2; - pixel_x = 15 - }, -/turf/template_noop, -/area/template_noop) "yJ" = ( /obj/effect/decal/cleanable/glass, /obj/effect/turf_decal{ @@ -1624,10 +1627,6 @@ /obj/effect/decal/cleanable/plastic, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"yV" = ( -/obj/structure/broken_flooring/singular/directional/east, -/turf/template_noop, -/area/template_noop) "yZ" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium{ layer = 2.9 @@ -1649,10 +1648,6 @@ }, /turf/open/floor/mineral/titanium/tiled/white, /area/ruin/space/has_grav/infested_frigate) -"zn" = ( -/obj/effect/spawner/random/trash, -/turf/template_noop, -/area/template_noop) "zK" = ( /obj/structure/cable, /obj/effect/turf_decal{ @@ -1674,6 +1669,10 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/airless, /area/template_noop) +"zU" = ( +/obj/structure/broken_flooring/pile/directional/east, +/turf/template_noop, +/area/template_noop) "zV" = ( /obj/machinery/suit_storage_unit/open, /obj/effect/turf_decal{ @@ -1843,10 +1842,6 @@ /obj/item/ammo_casing/spent, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"Dk" = ( -/obj/item/shard, -/turf/template_noop, -/area/template_noop) "DR" = ( /obj/structure/cable, /obj/effect/turf_decal{ @@ -1858,6 +1853,10 @@ /obj/effect/mob_spawn/corpse/human/engineer, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"Eg" = ( +/obj/item/stack/rods, +/turf/template_noop, +/area/template_noop) "Er" = ( /obj/effect/turf_decal{ icon_state = "arrows_red"; @@ -1894,6 +1893,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"EB" = ( +/obj/structure/girder/displaced, +/turf/template_noop, +/area/template_noop) "EL" = ( /obj/effect/turf_decal{ icon_state = "warningline_white" @@ -2042,12 +2045,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) -"GO" = ( -/obj/item/stack/rods{ - amount = 50 - }, -/turf/template_noop, -/area/template_noop) "Hc" = ( /obj/effect/decal/cleanable/blood/gibs{ icon_state = "larva_chest_s" @@ -2107,6 +2104,15 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"HD" = ( +/obj/structure/broken_flooring/singular/directional/south, +/turf/template_noop, +/area/template_noop) +"HP" = ( +/obj/structure/broken_flooring/plating/directional/north, +/obj/structure/broken_flooring/pile/directional/west, +/turf/template_noop, +/area/template_noop) "Im" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/mineral/plastitanium, @@ -2234,10 +2240,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"Kt" = ( -/obj/structure/girder/displaced, -/turf/template_noop, -/area/template_noop) "KA" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -2297,13 +2299,6 @@ /obj/machinery/power/rtg, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"KH" = ( -/obj/structure/lattice, -/obj/item/stack/rods{ - amount = 25 - }, -/turf/template_noop, -/area/template_noop) "KK" = ( /obj/effect/turf_decal{ icon_state = "arrows_red"; @@ -2336,10 +2331,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"KX" = ( -/obj/item/tank/internals/oxygen/empty, -/turf/template_noop, -/area/template_noop) "KZ" = ( /obj/structure/cable, /obj/effect/spawner/random/trash/garbage, @@ -2413,10 +2404,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) -"Ms" = ( -/obj/item/stack/rods, -/turf/template_noop, -/area/template_noop) "My" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/item/ammo_casing/spent, @@ -2547,6 +2534,12 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +"Or" = ( +/obj/item/stack/rods{ + amount = 23 + }, +/turf/template_noop, +/area/template_noop) "Ou" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -2646,6 +2639,13 @@ "Qg" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/space/has_grav/infested_frigate) +"Qj" = ( +/obj/structure/broken_flooring/plating/directional/north, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent, +/obj/item/ammo_casing/spent, +/turf/template_noop, +/area/template_noop) "Qm" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -2667,6 +2667,10 @@ /obj/machinery/suit_storage_unit/open, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/infested_frigate) +"QL" = ( +/obj/structure/broken_flooring/singular/directional/east, +/turf/template_noop, +/area/template_noop) "Ru" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -2742,8 +2746,8 @@ /obj/structure/alien/resin, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"RZ" = ( -/obj/structure/broken_flooring/pile/directional/east, +"RY" = ( +/obj/effect/spawner/random/trash, /turf/template_noop, /area/template_noop) "Sr" = ( @@ -2952,6 +2956,10 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/infested_frigate) +"VR" = ( +/obj/item/tank/internals/oxygen/empty, +/turf/template_noop, +/area/template_noop) "VU" = ( /obj/structure/cable, /obj/effect/decal/cleanable/vomit/old, @@ -3013,6 +3021,12 @@ }, /turf/open/floor/mineral/plastitanium/airless, /area/ruin/space/has_grav/infested_frigate) +"WS" = ( +/obj/item/stack/rods{ + amount = 50 + }, +/turf/template_noop, +/area/template_noop) "Xc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -3022,10 +3036,6 @@ /obj/effect/spawner/random/exotic/antag_gear, /turf/open/floor/plating, /area/ruin/space/has_grav/infested_frigate) -"Xh" = ( -/obj/item/ammo_casing/spent, -/turf/template_noop, -/area/template_noop) "Xm" = ( /obj/effect/decal/cleanable/xenoblood/xgibs{ icon_state = "xgibbl3" @@ -3082,16 +3092,6 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/infested_frigate) -"YB" = ( -/obj/structure/door_assembly/door_assembly_ext, -/turf/template_noop, -/area/template_noop) -"YL" = ( -/obj/structure/broken_flooring/plating/directional/east, -/obj/item/ammo_casing/spent, -/obj/item/ammo_casing/spent, -/turf/template_noop, -/area/template_noop) "YV" = ( /obj/effect/turf_decal{ icon_state = "warningline_white" @@ -3192,99 +3192,99 @@ /area/ruin/space/has_grav/infested_frigate) (1,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} (2,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} (3,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP xt SB xR -jt +fl xR xt SB wP -jt -jt -jt -jt +fl +fl +fl +fl "} (4,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP xt wP @@ -3294,23 +3294,23 @@ bZ wP xt wP -jt -jt -jt -jt +fl +fl +fl +fl "} (5,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl In wP wP @@ -3322,22 +3322,22 @@ bZ wP wP wX -jt -jt -jt +fl +fl +fl "} (6,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP fX wP @@ -3349,22 +3349,22 @@ wP wP eZ wP -jt -jt -jt +fl +fl +fl "} (7,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl mo mG wP @@ -3376,22 +3376,22 @@ wP ef Vt wP -jt -jt -jt +fl +fl +fl "} (8,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP EQ wP @@ -3403,22 +3403,22 @@ LF kw Po wP -jt -jt -jt +fl +fl +fl "} (9,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP qu wP @@ -3430,22 +3430,22 @@ LF fr kT wP -jt -jt -jt +fl +fl +fl "} (10,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP KF wP @@ -3457,22 +3457,22 @@ LF Ux zg wP -jt -jt -jt +fl +fl +fl "} (11,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP Ln wP @@ -3484,22 +3484,22 @@ AH yt YW vj -jt -jt -jt +fl +fl +fl "} (12,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj yJ wP @@ -3511,22 +3511,22 @@ ki Zp di vj -jt -jt -jt +fl +fl +fl "} (13,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj OC OC @@ -3538,22 +3538,22 @@ Et KA RG vj -jt -jt -jt +fl +fl +fl "} (14,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj xp ab @@ -3565,22 +3565,22 @@ SX xT qC vj -jt -jt -jt +fl +fl +fl "} (15,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj Ez Jx @@ -3592,22 +3592,22 @@ Ml hB xB vj -jt -jt -jt +fl +fl +fl "} (16,1,1) = {" -jt -jt -jt -jt -jt -jt -lp -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +gG +fl +fl +fl +fl wP nN rd @@ -3619,21 +3619,21 @@ Qg Ah hW wP -jt -jt -jt +fl +fl +fl "} (17,1,1) = {" -jt -jt -jt -GO -jt -jt -jt -ce -jt -xl +fl +fl +fl +WS +fl +fl +fl +qJ +fl +sT In BO nN @@ -3647,22 +3647,22 @@ dx wP wP wX -jt -jt +fl +fl "} (18,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -YB -jt -jt -xl -lQ +fl +fl +fl +fl +fl +fl +fl +fM +fl +fl +sT +HP xi KB wP @@ -3674,23 +3674,23 @@ cA vm qR jk -jt -jt +fl +fl "} (19,1,1) = {" -jt -jt -jt -jt -jt -jt -yV -jt -yF -jt -YL +fl +fl +fl +fl +fl +fl +QL +fl +Or +fl +be zN -xl +sT Lf wP VQ @@ -3701,23 +3701,23 @@ Tb wP aV wP -jt -jt +fl +fl "} (20,1,1) = {" -jt -jt -jt -jt -jt -zn -jt -jt -jt -no -jt -yI -KH +fl +fl +fl +fl +fl +RY +fl +fl +fl +rO +fl +pq +wq Pb wP TL @@ -3728,22 +3728,22 @@ wu tO WG yx -jt -jt +fl +fl "} (21,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -Ms -jt -kL +fl +fl +fl +fl +fl +fl +fl +fl +fl +Eg +fl +Qj er Qm wP @@ -3755,21 +3755,21 @@ wt wP wP li -jt -jt +fl +fl "} (22,1,1) = {" -jt -nf -jt -jt -Xh -Dk -jt -RZ -jt -jt -jt +fl +HD +fl +fl +qF +aB +fl +zU +fl +fl +fl ZI KW Fi @@ -3781,22 +3781,22 @@ wP oW wP wP -jt -jt -jt +fl +fl +fl "} (23,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj EL yP @@ -3808,22 +3808,22 @@ Jx lU Rx vj -jt -jt -jt +fl +fl +fl "} (24,1,1) = {" -jt -jt -jt -jt -jt -Kt -jt -jt -jt -jt -nf +fl +fl +fl +fl +fl +EB +fl +fl +fl +fl +HD vj ug Nu @@ -3835,22 +3835,22 @@ Im iy IC vj -jt -jt -jt +fl +fl +fl "} (25,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj YV Er @@ -3862,22 +3862,22 @@ wP iL nm vj -jt -jt -jt +fl +fl +fl "} (26,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP bM Ne @@ -3889,22 +3889,22 @@ wP UX Sr wP -jt -jt -jt +fl +fl +fl "} (27,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl hm wP MW @@ -3916,23 +3916,23 @@ wP XG wP li -jt -jt -jt +fl +fl +fl "} (28,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP cj wP @@ -3942,51 +3942,51 @@ Jw wP or wP -jt -jt -jt -jt +fl +fl +fl +fl "} (29,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP bD wP zV kS -gH +vo wP wu wP -jt -jt -jt -jt +fl +fl +fl +fl "} (30,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP CK wP @@ -3996,24 +3996,24 @@ Cp wP Zt wP -jt -jt -jt -jt +fl +fl +fl +fl "} (31,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP lx wP @@ -4023,24 +4023,24 @@ wP wP BI wP -jt -jt -jt -jt +fl +fl +fl +fl "} (32,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj Bw ip @@ -4050,24 +4050,24 @@ rz Ai KC vj -jt -jt -jt -jt +fl +fl +fl +fl "} (33,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj HA Cm @@ -4077,24 +4077,24 @@ MH eE AM vj -jt -jt -jt -jt +fl +fl +fl +fl "} (34,1,1) = {" -jt -jt -jt -jt -jt -jt -nf -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +HD +fl +fl +fl +fl +fl vj vM wP @@ -4104,24 +4104,24 @@ wP wP OK vj -jt -jt -jt -jt +fl +fl +fl +fl "} (35,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj cX wP @@ -4131,24 +4131,24 @@ Gt wP OK vj -jt -jt -jt -jt +fl +fl +fl +fl "} (36,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj iS wP @@ -4158,24 +4158,24 @@ wO wP oV vj -jt -jt -jt -jt +fl +fl +fl +fl "} (37,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl vj KK wP @@ -4185,24 +4185,24 @@ NX wP oo vj -jt -jt -jt -jt +fl +fl +fl +fl "} (38,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP af yZ @@ -4212,24 +4212,24 @@ yZ yZ sE wP -jt -jt -jt -jt +fl +fl +fl +fl "} (39,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP KD rL @@ -4239,24 +4239,24 @@ aY ie eo wP -jt -jt -jt -jt +fl +fl +fl +fl "} (40,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP Yd hA @@ -4266,51 +4266,51 @@ yG nG UV wP -jt -jt -jt -jt +fl +fl +fl +fl "} (41,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP qb cB -kc +kh mn hK LO vH wP -jt -jt -jt -jt +fl +fl +fl +fl "} (42,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP Vf SE @@ -4320,24 +4320,24 @@ Cm wj Iu wP -jt -jt -jt -jt +fl +fl +fl +fl "} (43,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP QA ZN @@ -4347,24 +4347,24 @@ Kl kg uC wP -jt -jt -jt -jt +fl +fl +fl +fl "} (44,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl wP fc Oy @@ -4374,24 +4374,24 @@ Mp Bh gW wP -jt -jt -jt -jt +fl +fl +fl +fl "} (45,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl hm wP cP @@ -4401,143 +4401,143 @@ RW oj wP li -jt -jt -jt -jt +fl +fl +fl +fl "} (46,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -KX -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +VR +fl +fl +fl +fl +fl +fl +fl "} (47,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} (48,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} (49,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} (50,1,1) = {" -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt -jt +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl +fl "} diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index f9574ce34bc..18dc918a109 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -153,6 +153,13 @@ /obj/structure/alien/egg/burst, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) +"aQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/neck/link_scryer/loaded/charlie, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/bridge) "aS" = ( /obj/structure/sign/poster/official/nanotrasen_logo, /turf/closed/wall, @@ -2456,6 +2463,16 @@ /obj/structure/sign/poster/official/work_for_a_future, /turf/closed/wall/rust, /area/ruin/space/ancientstation/charlie/dorms) +"kN" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/decoration/glowstick, +/obj/item/clothing/neck/link_scryer/loaded/charlie, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) "kO" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2578,6 +2595,12 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/atmos) +"lh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/rnd/server/oldstation, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/delta/rnd) "lk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -3864,16 +3887,6 @@ /obj/structure/chair, /turf/open/floor/iron/white/textured, /area/ruin/space/ancientstation/delta/proto) -"sq" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/decoration/glowstick, -/obj/structure/mirror/directional/west, -/obj/item/clothing/neck/link_scryer/loaded/charlie, -/turf/open/floor/iron, -/area/ruin/space/ancientstation/charlie/dorms) "ss" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4405,6 +4418,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) +"wg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/obj/structure/closet/crate/secure/weapon{ + req_access = list("away_sec") + }, +/obj/item/knife/combat, +/obj/item/clothing/suit/armor/vest/old, +/obj/item/gun/ballistic/rifle/boltaction, +/obj/item/ammo_box/strilka310, +/obj/item/ammo_box/strilka310, +/turf/open/floor/plating, +/area/ruin/space/ancientstation/delta/hall) "wi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/command{ @@ -4727,16 +4753,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/rnd) -"yN" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/decoration/glowstick, -/obj/item/clothing/neck/link_scryer/loaded/charlie, -/turf/open/floor/iron, -/area/ruin/space/ancientstation/charlie/dorms) "yQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/plasma/spawner/directional/south, @@ -4951,12 +4967,6 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/hall) -"Aj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/rnd/server/oldstation, -/turf/open/floor/iron, -/area/ruin/space/ancientstation/delta/rnd) "Al" = ( /turf/closed/mineral/iron, /area/space/nearstation) @@ -5168,6 +5178,11 @@ /obj/structure/cable, /turf/template_noop, /area/space/nearstation) +"BC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/fluff/broken_canister_frame, +/turf/open/floor/engine/airless, +/area/ruin/space/ancientstation/beta/supermatter) "BH" = ( /obj/item/solar_assembly, /obj/structure/cable, @@ -5412,11 +5427,6 @@ }, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/rnd) -"DK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/canister_frame/machine/unfinished_canister_frame, -/turf/open/floor/engine/airless, -/area/ruin/space/ancientstation/beta/supermatter) "DM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5617,19 +5627,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) -"Fy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/structure/closet/crate/secure/weapon{ - req_access = list("away_sec") - }, -/obj/item/knife/combat, -/obj/item/clothing/suit/armor/vest/old, -/obj/item/gun/ballistic/rifle/boltaction, -/obj/item/ammo_box/strilka310, -/obj/item/ammo_box/strilka310, -/turf/open/floor/plating, -/area/ruin/space/ancientstation/delta/hall) "Fz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -6709,6 +6706,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/ruin/space/ancientstation/beta/supermatter) +"Mt" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/decoration/glowstick, +/obj/structure/mirror/directional/west, +/obj/item/clothing/neck/link_scryer/loaded/charlie, +/turf/open/floor/iron, +/area/ruin/space/ancientstation/charlie/dorms) "Mu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, @@ -8119,13 +8126,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) -"Xf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/neck/link_scryer/loaded/charlie, -/turf/open/floor/iron, -/area/ruin/space/ancientstation/charlie/bridge) "Xj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10556,7 +10556,7 @@ NU xY lI CN -DK +BC iv Qi ZD @@ -12219,8 +12219,8 @@ aG nk mz gZ -yN -sq +kN +Mt mz nk nk @@ -12256,7 +12256,7 @@ aa aS wl bg -Xf +aQ aI ba bk @@ -12654,7 +12654,7 @@ AA ax aW aI -Xf +aQ bm qr aS @@ -14185,7 +14185,7 @@ kw Hk kw iq -Aj +lh WV ob hY @@ -15183,7 +15183,7 @@ Wd Np rp jg -Fy +wg yx bE Jg diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm index 953bde1f094..76e7da25fa4 100644 --- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm @@ -5532,7 +5532,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/structure/canister_frame/machine/unfinished_canister_frame, +/obj/structure/fluff/broken_canister_frame, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron, @@ -8017,7 +8017,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/structure/canister_frame/machine/unfinished_canister_frame, +/obj/structure/fluff/broken_canister_frame, /turf/open/floor/iron, /area/ruin/space/ks13/science/ordnance) "Zr" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 0e37692de27..801e86950e4 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -10354,7 +10354,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/hidden{ dir = 9 }, -/obj/structure/canister_frame/machine/unfinished_canister_frame, +/obj/structure/fluff/broken_canister_frame, /turf/open/floor/plating, /area/ruin/space/has_grav/skyrat/interdynefob/engineering) "Vw" = ( diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 0895d18df5c..cb2ffc90188 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -893,13 +893,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/project) -"arV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/table, -/obj/machinery/microwave/engineering/cell_included, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) "asb" = ( /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/dark/small, @@ -4717,24 +4710,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/noslip/tram_platform, /area/station/security/tram) -"bQF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/full, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/right/directional/east{ - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "pharmacy_shutters"; - name = "Pharmacy Shutters" - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/pharmacy) "bQU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -12281,6 +12256,17 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) +"eCD" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/gloves/color/fyellow{ + pixel_y = 7 + }, +/obj/structure/fluff/broken_canister_frame, +/obj/machinery/camera/autoname/directional/north, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plating, +/area/station/commons/storage/tools) "eDh" = ( /obj/effect/spawner/structure/window/survival_pod, /turf/open/floor/engine, @@ -18774,17 +18760,6 @@ }, /turf/open/floor/plating/rust, /area/station/maintenance/department/engine/atmos) -"gQx" = ( -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/color/fyellow{ - pixel_y = 7 - }, -/obj/structure/canister_frame/machine, -/obj/machinery/camera/autoname/directional/north, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/plating, -/area/station/commons/storage/tools) "gQG" = ( /obj/structure/window/spawner/directional/east, /obj/structure/closet/crate, @@ -20114,6 +20089,13 @@ /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"hln" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/table, +/obj/machinery/microwave/engineering/cell_included, +/turf/open/floor/iron, +/area/station/maintenance/department/engine/atmos) "hlo" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/camera/autoname/directional/north, @@ -21180,6 +21162,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"hDn" = ( +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/north, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/iron, +/area/station/maintenance/department/engine/atmos) "hDt" = ( /obj/structure/toilet{ pixel_y = 8 @@ -25015,10 +25005,6 @@ /obj/effect/spawner/random/armory/e_gun, /turf/open/floor/iron/dark/small, /area/station/ai_monitored/security/armory) -"iYh" = ( -/obj/structure/canister_frame/machine, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "iYj" = ( /obj/structure/table, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -26566,14 +26552,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"jCL" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/north, -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) "jCP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44051,6 +44029,10 @@ /obj/machinery/door/window/brigdoor/right/directional/west, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs/auxiliary) +"pGh" = ( +/obj/structure/fluff/broken_canister_frame, +/turf/open/floor/plating, +/area/station/maintenance/department/bridge) "pGp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -53097,6 +53079,24 @@ dir = 8 }, /area/station/commons/dorms) +"svU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/full, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "pharmacy_shutters"; + name = "Pharmacy Shutters" + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/pharmacy) "svZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -84216,7 +84216,7 @@ yjE fPv dja bNq -arV +hln dIm dQY ecq @@ -84473,7 +84473,7 @@ yjE uYG djC bNq -jCL +hDn dIe dRE ecF @@ -89641,7 +89641,7 @@ ueX slY slY slY -gQx +eCD hbv rkr hmj @@ -96076,7 +96076,7 @@ trk kjU izL iLV -iYh +pGh lZt lZt xYO @@ -104616,7 +104616,7 @@ wfr nPd wfr nPd -bQF +svU uxJ wfr wfr diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index b43c9c7acfc..58a80c3942f 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -36506,7 +36506,7 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/floor2/aft) "jEU" = ( -/obj/structure/canister_frame/machine, +/obj/structure/fluff/broken_canister_frame, /turf/open/floor/engine, /area/station/maintenance/floor1/port/aft) "jEX" = ( diff --git a/code/game/machinery/canister_frame.dm b/code/game/machinery/canister_frame.dm deleted file mode 100644 index 2e00aed0273..00000000000 --- a/code/game/machinery/canister_frame.dm +++ /dev/null @@ -1,103 +0,0 @@ -//Canister Frames -/obj/structure/canister_frame - name = "canister frame" - icon = 'icons/obj/pipes_n_cables/atmos.dmi' - icon_state = "frame_0" - density = TRUE - -/obj/structure/canister_frame/examine(user) - . = ..() - -/obj/structure/canister_frame/machine - name = "canister frame" - desc = "A frame used to build different kinds of canisters." - - /// The previous canister frame tier path - var/obj/structure/canister_frame/machine/prev_tier - /// The next canister frame tier path - var/obj/structure/canister_frame/machine/next_tier - /// The required item for going to next tier. Must be set if next_tier is set. - var/obj/item/stack/next_tier_reqitem - /// The amount of items required in the stack of the required item. Must be set if next_tier is set. - var/next_tier_reqitem_am - /// The finished usable canister path - var/atom/finished_obj - -/obj/structure/canister_frame/machine/deconstruct(disassembled = TRUE) - if (!(flags_1 & NODECONSTRUCT_1)) - // Spawn 5 sheets for the tier 0 frame - new /obj/item/stack/sheet/iron(loc, 5) - - // Loop backwards in the tiers and spawn the requirement for each tier - var/obj/structure/canister_frame/machine/i_prev = prev_tier - while(ispath(i_prev)) - var/obj/item/stack/prev_tier_reqitem = initial(i_prev.next_tier_reqitem) - var/prev_tier_reqitem_am = initial(i_prev.next_tier_reqitem_am) - new prev_tier_reqitem(loc, prev_tier_reqitem_am) - i_prev = initial(i_prev.prev_tier) - qdel(src) - -/obj/structure/canister_frame/machine/unfinished_canister_frame - name = "unfinished canister frame" - icon_state = "frame_0" - - next_tier = /obj/structure/canister_frame/machine/finished_canister_frame - next_tier_reqitem = /obj/item/stack/sheet/iron - next_tier_reqitem_am = 5 - -/obj/structure/canister_frame/machine/finished_canister_frame - name = "finished canister frame" - icon_state = "frame_1" - - prev_tier = /obj/structure/canister_frame/machine/unfinished_canister_frame - finished_obj = /obj/machinery/portable_atmospherics/canister - -/obj/structure/canister_frame/machine/examine(user) - . = ..() - . += span_notice("It can be dismantled by removing the bolts.") - - if(ispath(next_tier)) - var/item_name = initial(next_tier_reqitem.singular_name) - if(!item_name) - item_name = initial(next_tier_reqitem.name) - if(next_tier_reqitem_am > 1) - . += span_notice("It can be improved using [next_tier_reqitem_am] [item_name]\s.") - else - . += span_notice("It can be improved using \a [item_name].") - - if(ispath(finished_obj)) - . += span_notice("It can be finished off by screwing it together.") - -/obj/structure/canister_frame/machine/attackby(obj/item/S, mob/user, params) - if (ispath(next_tier) && istype(S, next_tier_reqitem)) - var/obj/item/stack/ST = S - var/reqitem_name = ST.singular_name ? ST.singular_name : ST.name - to_chat(user, span_notice("You start adding [next_tier_reqitem_am] [reqitem_name]\s to the frame...")) - if (ST.use_tool(src, user, 2 SECONDS, amount=next_tier_reqitem_am, volume=50)) - to_chat(user, span_notice("You added [next_tier_reqitem_am] [reqitem_name]\s to the frame, turning it into \a [initial(next_tier.name)].")) - new next_tier(drop_location()) - qdel(src) - return - return ..() - -/obj/structure/canister_frame/machine/screwdriver_act(mob/living/user, obj/item/I) - . = TRUE - if(..()) - return - if(ispath(finished_obj)) - to_chat(user, span_notice("You start tightening the screws on \the [src].")) - if (I.use_tool(src, user, 2 SECONDS, volume=50)) - to_chat(user, span_notice("You tighten the last screws on \the [src].")) - new finished_obj(drop_location()) - qdel(src) - return - return FALSE - -/obj/structure/canister_frame/machine/wrench_act(mob/living/user, obj/item/I) - . = TRUE - if(..()) - return - to_chat(user, span_notice("You start to dismantle \the [src]...")) - if (I.use_tool(src, user, 2 SECONDS, volume=50)) - to_chat(user, span_notice("You dismantle \the [src].")) - deconstruct() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1ad86868212..e9da67e9cc2 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("rack parts", /obj/item/rack_parts, category = CAT_FURNITURE), \ new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 1.5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_FURNITURE), \ null, \ - new/datum/stack_recipe("unfinished canister frame", /obj/structure/canister_frame/machine/unfinished_canister_frame, 5, time = 0.8 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_ATMOSPHERIC), \ + new/datum/stack_recipe("atmos canister", /obj/machinery/portable_atmospherics/canister, 10, time = 3 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_ATMOSPHERIC), \ null, \ new/datum/stack_recipe("floor tile", /obj/item/stack/tile/iron/base, 1, 4, 20, category = CAT_TILES), \ new/datum/stack_recipe("iron rod", /obj/item/stack/rods, 1, 2, 60, category = CAT_MISC), \ diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index bf39a3f3cca..78085b37d55 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -284,3 +284,10 @@ /obj/structure/fluff/tram_rail/anchor name = "tram rail anchor" icon_state = "anchor" + +/obj/structure/fluff/broken_canister_frame + name = "broken canister frame" + icon_state = "broken_canister" + anchored = FALSE + density = TRUE + deconstructible = TRUE diff --git a/icons/obj/fluff/general.dmi b/icons/obj/fluff/general.dmi index 3f990111c3c..2628eea8746 100644 Binary files a/icons/obj/fluff/general.dmi and b/icons/obj/fluff/general.dmi differ diff --git a/icons/obj/pipes_n_cables/atmos.dmi b/icons/obj/pipes_n_cables/atmos.dmi index 65cbdc672db..91badbf3ccf 100644 Binary files a/icons/obj/pipes_n_cables/atmos.dmi and b/icons/obj/pipes_n_cables/atmos.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 72dcecc048d..5e6449a723d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1900,7 +1900,6 @@ #include "code\game\machinery\barsigns.dm" #include "code\game\machinery\botlaunchpad.dm" #include "code\game\machinery\buttons.dm" -#include "code\game\machinery\canister_frame.dm" #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\civilian_bounties.dm" #include "code\game\machinery\constructable_frame.dm" diff --git a/tools/UpdatePaths/Scripts/78909_tiered_canister_removal.txt b/tools/UpdatePaths/Scripts/78909_tiered_canister_removal.txt new file mode 100644 index 00000000000..02f66d817a0 --- /dev/null +++ b/tools/UpdatePaths/Scripts/78909_tiered_canister_removal.txt @@ -0,0 +1,4 @@ +/obj/structure/canister_frame : /obj/structure/fluff/broken_canister_frame{@OLD} +/obj/structure/canister_frame/machine : /obj/structure/fluff/broken_canister_frame{@OLD} +/obj/structure/canister_frame/machine/unfinished_canister_frame : /obj/structure/fluff/broken_canister_frame{@OLD} +/obj/structure/canister_frame/machine/finished_canister_frame : /obj/structure/fluff/broken_canister_frame{@OLD} \ No newline at end of file