diff --git a/_maps/RandomRuins/SpaceRuins/nova/gorilla.dmm b/_maps/RandomRuins/SpaceRuins/nova/gorilla.dmm deleted file mode 100644 index aecf79a010e..00000000000 --- a/_maps/RandomRuins/SpaceRuins/nova/gorilla.dmm +++ /dev/null @@ -1,134 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/structure/chair/sofa/right/brown{ - dir = 4 - }, -/mob/living/basic/gorilla{ - anchored = 1; - dir = 4; - faction = list("neutral") - }, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"p" = ( -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"t" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/bananalamp, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"y" = ( -/obj/structure/flora/tree/palm, -/obj/structure/fans/tiny/invisible, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"C" = ( -/obj/structure/showcase/machinery/tv, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"H" = ( -/mob/living/basic/pet/dog/corgi{ - anchored = 1 - }, -/obj/structure/bed/dogbed, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"M" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"O" = ( -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/item/food/grown/banana, -/obj/structure/closet/secure_closet/freezer/fridge/open, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"U" = ( -/obj/structure/chair/sofa/left/brown{ - dir = 4 - }, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) -"V" = ( -/obj/structure/water_source/puddle, -/obj/structure/fans/tiny/invisible, -/turf/open/misc/beach/sand, -/area/ruin/space/has_grav/powered) - -(1,1,1) = {" -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -M -M -M -M -y -a -"} -(3,1,1) = {" -a -y -U -b -t -M -a -"} -(4,1,1) = {" -a -V -p -p -p -M -a -"} -(5,1,1) = {" -a -M -O -C -H -M -a -"} -(6,1,1) = {" -a -M -M -M -y -M -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -"} diff --git a/_maps/RandomRuins/SpaceRuins/nova/shuttle8532.dmm b/_maps/RandomRuins/SpaceRuins/nova/shuttle8532.dmm index 07f76580455..cdb3ee7d85d 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/shuttle8532.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/shuttle8532.dmm @@ -34,6 +34,7 @@ /obj/machinery/door/poddoor{ id = "abandonedshiphatch" }, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "ay" = ( @@ -74,6 +75,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532engineering) +"ba" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/rglass/fifty{ + pixel_y = 6 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "bo" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/chair/sofa/bench{ @@ -323,6 +332,14 @@ }, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532cargohall) +"gE" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/plastic/fifty{ + pixel_y = 5 + }, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "gI" = ( /obj/effect/mine/explosive, /obj/effect/decal/cleanable/blood, @@ -353,6 +370,7 @@ /area/ruin/space/has_grav/shuttle8532crewquarters) "hf" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/ruin/space/has_grav/shuttle8532bridge) "hh" = ( @@ -411,6 +429,7 @@ /obj/machinery/door/poddoor{ id = "abandonedshiphatch" }, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "iG" = ( @@ -492,7 +511,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532researchbay) "jQ" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532crewquarters) "kp" = ( /obj/structure/lattice/catwalk, @@ -509,7 +528,7 @@ nightshift_light_color = "#FF0000"; pixel_y = 32 }, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532bridge) "ky" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -712,7 +731,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532bridge) "pu" = ( -/turf/closed/wall/r_wall, +/turf/closed/wall/r_wall/syndicate, /area/ruin/space/has_grav/shuttle8532bridge) "py" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -993,7 +1012,7 @@ /area/ruin/space/has_grav/shuttle8532researchbay) "vE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532engineering) "vG" = ( /obj/item/stack/cable_coil/cut, @@ -1104,6 +1123,9 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532researchbay) +"xO" = ( +/turf/closed/indestructible/syndicate, +/area/ruin/space/has_grav/shuttle8532bridge) "xR" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -1175,7 +1197,7 @@ /area/ruin/space/has_grav/shuttle8532crewquarters) "zz" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532engineering) "zA" = ( /obj/effect/decal/cleanable/cobweb, @@ -1331,7 +1353,7 @@ dir = 9; system_id = "ship_outer_turrets" }, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532researchbay) "BR" = ( /obj/item/chair{ @@ -1514,7 +1536,7 @@ nightshift_light_color = "#00FF00"; pixel_y = 32 }, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532bridge) "EQ" = ( /obj/effect/decal/cleanable/dirt, @@ -1567,6 +1589,12 @@ }, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532cargohall) +"FW" = ( +/mob/living/basic/trooper/syndicate/melee/space/anthro/lizard{ + faction = null + }, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532bridge) "Gv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mob_spawn/corpse/human/syndicatecommando, @@ -1632,11 +1660,10 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532bridge) "HP" = ( -/obj/structure/window/reinforced/fulltile, /obj/machinery/door/poddoor{ id = "abandonedshipbridgeblast" }, -/turf/open/floor/plating, +/turf/closed/indestructible/opsglass, /area/ruin/space/has_grav/shuttle8532bridge) "HW" = ( /obj/effect/decal/cleanable/dirt, @@ -1836,7 +1863,9 @@ /turf/open/floor/engine/airless, /area/ruin/space/has_grav/shuttle8532engineering) "MM" = ( -/mob/living/basic/trooper/syndicate/melee/space, +/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper{ + faction = null + }, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532engineering) "MO" = ( @@ -1966,6 +1995,12 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532researchbay) +"Pn" = ( +/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper/anthro/fox{ + faction = null + }, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532bridge) "Ps" = ( /obj/effect/decal/cleanable/blood, /obj/effect/mapping_helpers/broken_floor, @@ -2026,7 +2061,7 @@ /turf/template_noop, /area/template_noop) "QR" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532engineering) "Ra" = ( /obj/structure/table/reinforced, @@ -2069,7 +2104,7 @@ dir = 5; system_id = "ship_outer_turrets" }, -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532researchbay) "RY" = ( /obj/effect/decal/cleanable/dirt, @@ -2114,7 +2149,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "SJ" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532researchbay) "Tq" = ( /turf/open/floor/engine/airless, @@ -2183,8 +2218,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532bridge) "Uy" = ( -/mob/living/basic/trooper/syndicate/melee/space, -/turf/open/floor/iron/airless, +/turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/shuttle8532bridge) "UN" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -2272,7 +2306,7 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532researchbay) "Wz" = ( -/turf/closed/wall/r_wall, +/turf/closed/indestructible/syndicate, /area/ruin/space/has_grav/shuttle8532cargohall) "WH" = ( /obj/effect/turf_decal/trimline/blue/filled/line, @@ -2490,7 +2524,7 @@ qb qb kx -pu +xO qb qb qb @@ -2553,7 +2587,7 @@ qb qb by ZK -pu +xO jQ jQ qb @@ -2616,7 +2650,7 @@ qb qb OQ vK -pu +xO Vf jQ qb @@ -2742,7 +2776,7 @@ qb qb ZN bs -pu +xO Fu jQ jQ @@ -2803,9 +2837,9 @@ qb "} (6,1,1) = {" qb -pu +xO EE -pu +xO Lt NJ La @@ -2866,11 +2900,11 @@ qb "} (7,1,1) = {" qb -pu -pu -pu -pu -pu +xO +xO +xO +xO +xO xK jQ jQ @@ -2929,11 +2963,11 @@ qb "} (8,1,1) = {" pu -pu +Uy XQ fp HK -pu +xO cg Hs oR @@ -2994,9 +3028,9 @@ qb pu zA ZU -Uy +Vi ks -pu +xO jQ jQ iy @@ -3057,9 +3091,9 @@ qb HP eV Wq -Vi +Pn ff -pu +xO VB BK DY @@ -3122,7 +3156,7 @@ eV Gv Vi BS -pu +xO sH Ds uq @@ -3185,7 +3219,7 @@ ji Vi NK ps -pu +xO ha Ds wU @@ -3248,7 +3282,7 @@ Ji fn zG Ep -pu +xO RE uK wU @@ -3311,7 +3345,7 @@ eV Vi eC ER -pu +xO UN Ds re @@ -3437,7 +3471,7 @@ eV nd Vj xR -pu +xO uG yz Nx @@ -3500,7 +3534,7 @@ Ra jJ OZ ff -pu +xO RE Ds yv @@ -3563,7 +3597,7 @@ zX Vi Qv Se -pu +xO Ue TM Ip @@ -3623,10 +3657,10 @@ hP (19,1,1) = {" HP eV -Uy +Vi Vi Ux -pu +xO ac TM yv @@ -3687,9 +3721,9 @@ qb HP eV Wq -Vi +FW Hg -pu +xO jh iP ef @@ -3747,12 +3781,12 @@ YO qb "} (21,1,1) = {" -pu +xO eV vS Vi qP -pu +xO jQ jQ aw @@ -3810,12 +3844,12 @@ YO qb "} (22,1,1) = {" -pu -pu +xO +xO Yk Ci HK -pu +xO lt VF NJ @@ -3874,11 +3908,11 @@ ve "} (23,1,1) = {" qb -pu -pu -pu -pu -pu +xO +xO +xO +xO +xO NJ jQ jQ @@ -3939,7 +3973,7 @@ hP ts OQ nx -pu +xO CG Fu Ff @@ -4002,7 +4036,7 @@ qb qb OQ Xu -pu +xO NJ jQ jQ @@ -4128,7 +4162,7 @@ qb qb tP bs -pu +xO Qn jQ qb @@ -4189,9 +4223,9 @@ ve "} (28,1,1) = {" qb -pu +xO ds -pu +xO jQ jQ qb @@ -4242,8 +4276,8 @@ QR QR oJ kL -Yq -JB +gE +ba QR HW Tt @@ -4254,7 +4288,7 @@ hP qb qb EM -pu +xO qb qb qb diff --git a/_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm index c055ff2272c..7c74de2a09d 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm @@ -4478,6 +4478,9 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel) "xD" = ( diff --git a/_maps/map_files/generic/CentCom_nova_z2.dmm b/_maps/map_files/generic/CentCom_nova_z2.dmm index 7f12a58bb35..7a4a72b2015 100644 --- a/_maps/map_files/generic/CentCom_nova_z2.dmm +++ b/_maps/map_files/generic/CentCom_nova_z2.dmm @@ -41,6 +41,13 @@ }, /turf/open/floor/fakebasalt, /area/centcom/holding/cafepark) +"abV" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "cafesposals" + }, +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "abZ" = ( /obj/machinery/vending/clothing, /obj/effect/turf_decal/bot, @@ -82,7 +89,10 @@ /area/centcom/holding/cafe) "adU" = ( /obj/effect/turf_decal/delivery, -/obj/structure/closet/crate/bin, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "aer" = ( @@ -329,6 +339,7 @@ /obj/item/tank/internals/plasmaman/belt/full, /obj/item/tank/internals/plasmaman/belt/full, /obj/item/tank/internals/plasmaman/belt/full, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "ahI" = ( @@ -738,6 +749,15 @@ "amx" = ( /turf/closed/wall/mineral/stone, /area/centcom/holding/cafepark) +"amA" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "amD" = ( /obj/structure/sink/directional/east, /obj/machinery/button/door{ @@ -938,7 +958,11 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -1116,7 +1140,6 @@ /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) "aqX" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -1131,6 +1154,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -1406,6 +1433,10 @@ pixel_y = 16; pixel_x = -2 }, +/obj/item/clothing/neck/necklace/translator/hearthkin, +/obj/item/clothing/neck/necklace/translator/hearthkin, +/obj/item/clothing/neck/necklace/translator/hearthkin, +/obj/item/clothing/neck/necklace/translator/hearthkin, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafepark) "avn" = ( @@ -1700,6 +1731,9 @@ }, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -2038,6 +2072,9 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/open/indestructible/plating, /area/centcom/holding/cafepark) "aBd" = ( @@ -2120,6 +2157,7 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -2263,6 +2301,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -2506,6 +2545,7 @@ /obj/effect/spawner/random/bedsheet/double, /obj/effect/spawner/random/bedsheet/double, /obj/effect/spawner/random/bedsheet/double, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aHb" = ( @@ -2762,6 +2802,12 @@ "aKc" = ( /turf/open/indestructible/cobble/side, /area/centcom/holding/cafepark) +"aKp" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "aKu" = ( /obj/structure/flora/bush/jungle/b, /turf/open/misc/grass/planet, @@ -3873,6 +3919,7 @@ /obj/item/clothing/mask/breath/vox, /obj/item/clothing/mask/breath/vox, /obj/item/clothing/mask/breath/vox, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "aWi" = ( @@ -3906,6 +3953,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -4262,6 +4310,15 @@ }, /turf/open/floor/carpet, /area/centcom/holding/cafe) +"bif" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "bit" = ( /obj/machinery/door/airlock{ id_tag = "room7"; @@ -4335,6 +4392,9 @@ dir = 1 }, /obj/effect/landmark/latejoin, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "blD" = ( @@ -4389,6 +4449,11 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"bpP" = ( +/obj/machinery/light/directional/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) "bqc" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -4521,6 +4586,15 @@ }, /turf/open/floor/bamboo, /area/centcom/holding/cafe) +"bAX" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "bBV" = ( /obj/structure/showcase/fakeid{ dir = 4 @@ -4617,6 +4691,17 @@ /obj/machinery/biogenerator, /turf/closed/indestructible/wood, /area/centcom/holding/cafe) +"bIs" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) +"bIG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "bIL" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -5258,6 +5343,15 @@ }, /turf/open/indestructible/carpet, /area/centcom/holding/cafe) +"cHy" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "cHY" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -5295,6 +5389,13 @@ /obj/effect/turf_decal/delivery/blue, /turf/open/floor/iron, /area/centcom/interlink) +"cMd" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating, +/area/centcom/interlink) "cMh" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -5558,6 +5659,11 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/centcom/interlink) +"dkH" = ( +/obj/structure/chair/stool/bar/directional/north, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "dkR" = ( /obj/effect/light_emitter/interlink, /obj/effect/turf_decal/weather/dirt{ @@ -6202,6 +6308,16 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/centcom/interlink) +"eGs" = ( +/obj/machinery/recycler{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "intersposals" + }, +/turf/open/floor/plating, +/area/centcom/interlink) "eHo" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -6304,6 +6420,22 @@ /obj/effect/landmark/latejoin, /turf/open/floor/iron/dark, /area/centcom/interlink) +"ePa" = ( +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/wood/glass{ + desc = "A strange small bar. It's actually remarkably close to Space Station 13."; + name = "The Snoozy Floofer" + }, +/obj/structure/fans/tiny/invisible, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "darkfull" + }, +/area/centcom/holding/cafe) "ePw" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -6357,6 +6489,20 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/iron, /area/centcom/interlink) +"eXn" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "intersposals" + }, +/turf/open/floor/plating, +/area/centcom/interlink) +"eXw" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) "eYD" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -6505,10 +6651,23 @@ /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafepark) +"fkF" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Interlink Shuttle" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) "fmq" = ( /obj/structure/frame/computer, /turf/open/floor/plating, /area/centcom/interlink) +"fmr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "foq" = ( /obj/structure/sign/poster/official/cleanliness/directional/east, /obj/structure/noticeboard/directional/north, @@ -6530,10 +6689,11 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "fov" = ( -/turf/closed/indestructible/fakedoor{ - desc = "Why would you want to go back, you just got here!"; - name = "Central Command Dock" +/obj/machinery/door/airlock/hatch{ + name = "Custodial Closet" }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, /area/centcom/interlink) "foI" = ( /obj/machinery/status_display/evac/directional/north, @@ -6738,6 +6898,14 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) +"fLG" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "fMM" = ( /obj/machinery/duct, /turf/open/floor/iron/dark, @@ -6926,6 +7094,16 @@ }, /turf/open/floor/wood, /area/centcom/holding/cafepark) +"gcJ" = ( +/obj/machinery/recycler{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "cafesposals" + }, +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "gdL" = ( /obj/structure/towel_bin, /obj/structure/table/wood, @@ -7142,6 +7320,15 @@ }, /turf/open/floor/wood, /area/centcom/interlink/dorm_rooms) +"guN" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "gxF" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -7165,6 +7352,9 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "gyS" = ( @@ -7247,6 +7437,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"gLS" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/indestructible/steel, +/area/centcom/holding/cafe) "gMw" = ( /turf/closed/wall/mineral/sandstone, /area/centcom/holding/cafedorms) @@ -7348,6 +7542,12 @@ /obj/structure/flora/bush/jungle/b, /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) +"gWk" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "gWT" = ( /obj/structure/table/wood, /obj/item/toy/cards/deck/cas/black, @@ -7365,6 +7565,10 @@ /area/centcom/interlink) "gZK" = ( /obj/structure/table/wood, +/obj/item/clothing/neck/necklace/translator, +/obj/item/clothing/neck/necklace/translator, +/obj/item/clothing/neck/necklace/translator, +/obj/item/clothing/neck/necklace/translator, /turf/open/floor/fakebasalt, /area/centcom/holding/cafepark) "gZM" = ( @@ -7656,6 +7860,12 @@ /obj/effect/landmark/latejoin, /turf/open/floor/mineral/titanium, /area/centcom/interlink) +"huK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "hvy" = ( /obj/machinery/door/poddoor/shuttledock/interlink, /turf/open/floor/plating, @@ -8077,6 +8287,15 @@ "iki" = ( /turf/open/floor/carpet, /area/centcom/holding/cafe) +"ikj" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "ikl" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -8134,6 +8353,9 @@ /obj/effect/turf_decal/trimline/dark_green/filled/warning{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "iov" = ( @@ -8317,6 +8539,25 @@ /obj/structure/fireplace, /turf/open/floor/iron/dark, /area/centcom/interlink) +"iEh" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "iFq" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -8353,6 +8594,15 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"iJk" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "iJK" = ( /obj/structure/flora/bush/jungle/a, /turf/open/misc/grass/planet, @@ -8437,6 +8687,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafepark) "iUg" = ( @@ -8598,6 +8851,13 @@ }, /turf/open/indestructible/plating, /area/centcom/holding/cafepark) +"jfB" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "cargodisposals"; + name = "disposals conveyor switch" + }, +/turf/open/floor/plating, +/area/centcom/interlink) "jgg" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, @@ -8694,10 +8954,21 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/centcom/interlink) +"joj" = ( +/obj/structure/disposalpipe/segment, +/turf/open/misc/dirt/planet, +/area/centcom/holding/cafepark) "joE" = ( /obj/structure/chair/sofa/corp/left, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) +"jpm" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "jqm" = ( /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/bot_blue, @@ -8715,11 +8986,14 @@ /area/centcom/interlink) "jsN" = ( /obj/machinery/light/directional/east, -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 4 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/iron, /area/centcom/interlink) "jsY" = ( @@ -8828,6 +9102,24 @@ }, /turf/open/floor/wood, /area/centcom/holding/cafedorms) +"jCs" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "jDf" = ( /obj/structure/table/bronze, /obj/structure/stone_tile/block/burnt, @@ -8906,6 +9198,15 @@ /obj/structure/bed/pod, /turf/open/floor/iron, /area/centcom/interlink) +"jMh" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "jNB" = ( /obj/machinery/light/floor{ alpha = 0; @@ -9046,6 +9347,14 @@ /obj/machinery/light/small/directional/east, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafepark) +"kam" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "kdo" = ( /obj/structure/hedge/opaque, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -9372,6 +9681,15 @@ icon_state = "white" }, /area/centcom/holding/cafepark) +"kJA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "kJL" = ( /obj/item/flashlight/flare/candle/infinite{ pixel_x = 9; @@ -9398,6 +9716,9 @@ /obj/machinery/computer/records/security{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_large, /area/centcom/interlink) "kKs" = ( @@ -9447,6 +9768,12 @@ }, /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) +"kNb" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "kNd" = ( /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/machinery/door/airlock/service{ @@ -9515,6 +9842,12 @@ /obj/machinery/light/warm/directional/north, /turf/open/floor/iron/dark, /area/centcom/interlink) +"kTY" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "kWb" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -9535,6 +9868,9 @@ /turf/open/floor/iron/dark, /area/centcom/interlink) "kWH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/grimy, /area/centcom/interlink) "kWI" = ( @@ -9791,6 +10127,10 @@ /obj/machinery/vending/boozeomat/cafe, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) +"lnY" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) "loR" = ( /obj/structure/railing/corner{ dir = 4 @@ -9865,6 +10205,24 @@ }, /turf/open/floor/iron/white, /area/centcom/interlink) +"lyP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) "lzk" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -9897,6 +10255,15 @@ }, /turf/open/misc/dirt/planet, /area/centcom/holding/cafepark) +"lBC" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "lCi" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north{ @@ -9971,6 +10338,13 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/centcom/interlink) +"lIt" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "lIy" = ( /obj/structure/chair/sofa/right/brown{ dir = 1 @@ -10195,6 +10569,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/plating, /area/centcom/holding/cafepark) "mfN" = ( @@ -10228,6 +10603,9 @@ }, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/turf_decal/delivery/white, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_large, /area/centcom/interlink) "mju" = ( @@ -10254,6 +10632,7 @@ /obj/effect/turf_decal/trimline/dark_green/filled/warning{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/centcom/interlink) "mnj" = ( @@ -10391,6 +10770,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -10418,10 +10800,14 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "mza" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafepark) "mzf" = ( @@ -10779,6 +11165,12 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) +"nbG" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "ncr" = ( /obj/machinery/deepfryer, /turf/open/floor/wood, @@ -10801,10 +11193,27 @@ }, /turf/open/floor/iron, /area/centcom/holding/cafe) +"nfi" = ( +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Interlink" + }, +/obj/effect/turf_decal/siding/dark, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "ngg" = ( /obj/structure/chair/stool/bar/directional/west, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) +"ngU" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "nhZ" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -11114,6 +11523,9 @@ /obj/effect/turf_decal/arrows{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/centcom/interlink) "nKt" = ( @@ -11201,6 +11613,13 @@ /obj/item/reagent_containers/cup/glass/mug/coco, /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) +"nPs" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/warning{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/centcom/interlink) "nQm" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -11292,6 +11711,9 @@ dir = 9 }, /obj/effect/landmark/latejoin, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/centcom/interlink) "nYF" = ( @@ -11358,6 +11780,12 @@ dir = 6 }, /area/centcom/holding/cafepark) +"ogd" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "ogq" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -11493,6 +11921,21 @@ }, /turf/open/floor/wood, /area/centcom/interlink/dorm_rooms) +"oso" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron, +/area/centcom/interlink) +"osF" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "ouF" = ( /obj/item/toy/plush/moth{ name = "Buzz Buzz" @@ -11901,6 +12344,12 @@ /obj/effect/turf_decal/siding/wood, /turf/closed/indestructible/weeb, /area/centcom/holding/cafe) +"oZK" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "paj" = ( /obj/structure/chair/sofa/corp/right{ dir = 4 @@ -12006,6 +12455,24 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) +"pgJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "pgL" = ( /obj/structure/chair/sofa/bench/right, /obj/effect/turf_decal/trimline/dark_green/filled/line{ @@ -12034,6 +12501,25 @@ }, /turf/open/misc/dirt/planet, /area/centcom/holding/cafepark) +"pit" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) "pkJ" = ( /obj/structure/fans/tiny/invisible, /obj/structure/fence{ @@ -12177,6 +12663,20 @@ icon_state = "white" }, /area/centcom/holding/cafepark) +"pxG" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "pxW" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -12237,6 +12737,11 @@ /obj/structure/table, /turf/open/floor/iron/white, /area/centcom/interlink/dorm_rooms) +"pEH" = ( +/obj/machinery/light/directional/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "pET" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -12363,6 +12868,19 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) +"pLK" = ( +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/wood/glass{ + name = "Lounge" + }, +/obj/structure/fans/tiny/invisible, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hoteltile{ + icon_state = "darkfull" + }, +/area/centcom/holding/cafe) "pMg" = ( /obj/machinery/door/airlock{ id_tag = "room1"; @@ -12690,11 +13208,24 @@ /obj/effect/landmark/latejoin, /turf/open/floor/iron, /area/centcom/interlink) +"qjL" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "qkZ" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/iron, /area/centcom/interlink) +"qmB" = ( +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "qmG" = ( /obj/machinery/light/directional/south, /obj/structure/chair/stool/directional/south{ @@ -13067,6 +13598,9 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/interlink) +"qQv" = ( +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "qRd" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, @@ -13254,6 +13788,24 @@ /obj/structure/fake_stairs/wood/directional/east, /turf/closed/indestructible/wood, /area/centcom/holding/cafepark) +"rku" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) "rkW" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/closet/crate/bin, @@ -13413,6 +13965,13 @@ icon_state = "darkfull" }, /area/centcom/holding/cafepark) +"rCG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/centcom/interlink) "rDg" = ( /obj/effect/light_emitter/interlink, /obj/effect/turf_decal/weather/dirt{ @@ -13426,6 +13985,27 @@ }, /turf/open/floor/iron, /area/centcom/interlink) +"rEG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "rFa" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 8 @@ -13568,6 +14148,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -13954,6 +14537,10 @@ /obj/structure/chair/sofa/bench/left, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) +"srf" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/indestructible/fakeglass, +/area/centcom/holding/cafe) "srA" = ( /obj/structure/chair/wood{ dir = 8 @@ -14028,12 +14615,19 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/white, /area/centcom/interlink) +"svq" = ( +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "sxE" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "syc" = ( @@ -14054,6 +14648,9 @@ name = "Lounge" }, /obj/structure/fans/tiny/invisible, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/indestructible/hoteltile{ icon_state = "darkfull" }, @@ -14440,7 +15037,6 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe) "tct" = ( -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/tile/neutral{ @@ -14453,6 +15049,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -14572,6 +15172,7 @@ /obj/effect/turf_decal/weather/dirt{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/plating, /area/centcom/holding/cafepark) "ttx" = ( @@ -14610,6 +15211,27 @@ icon_state = "white" }, /area/centcom/holding/cafepark) +"tuX" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) "tvh" = ( /obj/structure/fence{ dir = 4 @@ -14733,6 +15355,17 @@ }, /turf/open/floor/wood, /area/centcom/holding/cafe) +"tIy" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "tIM" = ( /obj/structure/flora/bush/jungle/b, /obj/structure/fans/tiny/invisible, @@ -14747,6 +15380,12 @@ "tKt" = ( /turf/open/floor/plating/abductor, /area/centcom/holding/cafepark) +"tKS" = ( +/obj/machinery/door/airlock/wood{ + name = "Disposals" + }, +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "tLu" = ( /obj/item/toy/plush/lizard_plushie/green{ name = "Soaks-The-Rays" @@ -14817,6 +15456,7 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/centcom/interlink) "tXa" = ( @@ -15031,6 +15671,34 @@ }, /turf/open/floor/carpet/cyan, /area/centcom/holding/cafe) +"ufE" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) +"ugp" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "cafesposals"; + name = "disposal conveyor" + }, +/turf/open/indestructible/plating, +/area/centcom/holding/cafe) "uhO" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -15100,6 +15768,15 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) +"uks" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/centcom/interlink) "umm" = ( @@ -15121,6 +15798,14 @@ /obj/effect/landmark/latejoin, /turf/open/floor/iron, /area/centcom/interlink) +"uoo" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "uoM" = ( /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool/cobble, @@ -15161,6 +15846,10 @@ /obj/structure/chair/wood, /turf/open/misc/grass/planet, /area/centcom/holding/cafepark) +"uxo" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/centcom/interlink) "uxW" = ( /turf/open/misc/beach/coast{ dir = 4 @@ -15358,6 +16047,15 @@ dir = 8 }, /area/centcom/holding/cafe) +"uUo" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "uVm" = ( /obj/structure/stone_tile/center, /obj/structure/stone_tile/surrounding_tile{ @@ -15469,6 +16167,24 @@ /obj/item/kirbyplants/organic/plant22, /turf/open/floor/iron/dark, /area/centcom/interlink) +"vdA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafe) "vdW" = ( /obj/structure/flora/bush/jungle/b, /obj/effect/light_emitter/interlink, @@ -15519,6 +16235,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/indestructible/hoteltile{ icon_state = "floor" }, @@ -15657,6 +16374,9 @@ /obj/structure/fence{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/indestructible/plating, /area/centcom/holding/cafepark) "vzH" = ( @@ -15664,6 +16384,9 @@ /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "vDr" = ( @@ -15813,6 +16536,13 @@ }, /turf/open/floor/wood, /area/centcom/interlink) +"vSV" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "vTT" = ( /turf/closed/indestructible/steel, /area/centcom/holding/cafe) @@ -15912,6 +16642,24 @@ }, /turf/open/floor/iron/dark, /area/centcom/interlink) +"wbI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/indestructible/hoteltile{ + icon_state = "floor" + }, +/area/centcom/holding/cafepark) "wcd" = ( /obj/structure/flora/bush/flowers_pp, /obj/structure/flora/bush/flowers_br, @@ -15971,6 +16719,9 @@ /area/centcom/holding/cafe) "wfh" = ( /obj/effect/landmark/latejoin, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "wft" = ( @@ -16111,6 +16862,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/holding/cafe) +"wwq" = ( +/obj/structure/table/wood, +/obj/structure/disposalpipe/segment, +/turf/open/indestructible/hotelwood, +/area/centcom/holding/cafe) "wwD" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -16118,6 +16874,15 @@ /obj/effect/light_emitter/interlink, /turf/open/floor/grass, /area/centcom/interlink) +"wwF" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/line{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "wyd" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -16213,11 +16978,14 @@ /area/centcom/holding/cafepark) "wFF" = ( /obj/machinery/light/directional/west, -/obj/structure/closet/crate/bin, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/open/floor/iron, /area/centcom/interlink) "wGV" = ( @@ -16267,6 +17035,10 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) +"wIA" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/centcom/interlink) "wIO" = ( /obj/effect/turf_decal/sand, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -16432,6 +17204,15 @@ /obj/structure/chair/sofa/bench/corner, /turf/open/floor/wood/large, /area/centcom/holding/cafe) +"wZP" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "wZS" = ( /obj/item/storage/cans/sixbeer, /turf/open/floor/carpet/orange, @@ -16514,6 +17295,15 @@ /obj/machinery/duct, /turf/open/floor/wood/tile, /area/centcom/interlink) +"xkb" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/centcom/interlink) "xkO" = ( /obj/structure/railing{ dir = 4 @@ -23413,7 +24203,7 @@ tvw tvw qLQ aXG -xyz +kam nYB ePw tvw @@ -24442,7 +25232,7 @@ ekE wOQ hvQ hvQ -hvQ +bIG bck tvw aWb @@ -24699,7 +25489,7 @@ jaf hvQ hvQ aTS -hvQ +bIG hvQ tvw aWb @@ -24956,7 +25746,7 @@ eXg hvQ deD tvw -hvQ +bIG dPd tvw kdy @@ -25213,7 +26003,7 @@ hvQ hvQ hvQ kfb -lvR +jMh wHJ tvw hZk @@ -25470,7 +26260,7 @@ hvQ hvQ hvQ hvQ -dGD +ngU nJp tvw kdy @@ -25984,7 +26774,7 @@ iPs iPs iPs fOv -dGD +ngU uPd tvw tvw @@ -26241,7 +27031,7 @@ iPs iPs iPs rDL -dGD +ngU wck tvw uis @@ -26755,7 +27545,7 @@ xgz jzh sIH lPi -iMY +lBC wck tvw sNg @@ -27012,7 +27802,7 @@ xgz pST oQW lPi -iMY +lBC wck tvw fzV @@ -27526,7 +28316,7 @@ lVL olE olE wtI -dGD +ngU nJp tvw tvw @@ -27783,7 +28573,7 @@ cRs pST sIH lPi -iMY +lBC cGt pHe saE @@ -28040,7 +28830,7 @@ olE pST oQW lPi -iMY +lBC nJp xPZ aXG @@ -28297,7 +29087,7 @@ iwK lPi lPi jHw -iMY +lBC nJp rYy tvw @@ -28554,7 +29344,7 @@ oIK kOZ kOZ wFF -oOC +uUo pSt cWG exf @@ -28810,8 +29600,8 @@ eYX mqE hvQ hvQ -hvQ -hvQ +nbG +uks hvQ hvQ hvQ @@ -29067,7 +29857,7 @@ lPi aUh hvQ hvQ -hvQ +bIG hvQ hvQ hvQ @@ -29324,7 +30114,7 @@ lPi crf anv ybB -mqE +guN hvQ hvQ hvQ @@ -29581,7 +30371,7 @@ tvw lPi lPi tvw -iMY +lBC hvQ hvQ aBm @@ -29838,7 +30628,7 @@ xKN olE olE bwP -dGD +ngU hvQ hvQ hvQ @@ -30095,7 +30885,7 @@ fYY olE olE wtI -dGD +ngU hvQ hvQ bTH @@ -30609,7 +31399,7 @@ kOZ kOZ wHJ tGG -dGD +ngU hvQ hvQ hvQ @@ -30852,7 +31642,7 @@ rMF hES rDL hvQ -hvQ +bIG hvQ hvQ tGG @@ -30866,8 +31656,8 @@ hvQ hvQ cGt tGG -dGD -hvQ +bAX +kTY hvQ hvQ hvQ @@ -31109,23 +31899,23 @@ aXG jXO rDL hvQ -hvQ -hvQ -aTS -tGG -dGD -lrp -eYX +kNb +lnY +bpP +fkF +amA +bIs +eXw tWA -eYX -eYX -eYX -eYX -bod -tGG +eXw +eXw +eXw +eXw +nPs +fkF mjK -mqE -lrp +wZP +lIt jsN eYX eYX @@ -31370,7 +32160,7 @@ lPi lPi tvw hoS -iMY +lBC nJp tvw tvw @@ -31381,8 +32171,8 @@ tvw tvw tvw jHw -iMY -nJp +oso +vSV rYy tvw dHP @@ -31627,7 +32417,7 @@ vat vat cNw tvw -iMY +lBC nJp tvw iVr @@ -31884,7 +32674,7 @@ vat iov vat lPi -iMY +lBC nJp tvw tfe @@ -31895,7 +32685,7 @@ pry bsj chZ pMg -dGD +ngU nJp aDg mDR @@ -32141,7 +32931,7 @@ vat vat vat lPi -iMY +lBC nJp tvw tvw @@ -32152,7 +32942,7 @@ hVC bsj osk tvw -iMY +lBC nJp aDg fVr @@ -32398,7 +33188,7 @@ vat vat xmn lPi -iMY +lBC pSt kOZ sga @@ -32409,7 +33199,7 @@ bsj bsj bsj tvw -iMY +lBC nJp tvw jSW @@ -32655,7 +33445,7 @@ vat vat vat tvw -iMY +lBC lrp eYX aPe @@ -32923,7 +33713,7 @@ tvw tvw tvw tvw -iMY +lBC nJp aDg kLZ @@ -33048,128 +33838,128 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(63,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(63,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +tvw +cMd +uxo fov -hES -aXG -aXG -aXG -pmJ -aXG -aXG -aXG -pmJ -aXG -aXG -aXG -aXG -aXG -pPI -dGD +jpm +wIA +wIA +wIA +pEH +wIA +gWk +wIA +pEH +wIA +wIA +wIA +wIA +wIA +nfi +iJk nJp tvw iVr @@ -33180,7 +33970,7 @@ nsT bsj nYF tvw -iMY +lBC nJp aDg fVr @@ -33407,9 +34197,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tvw +eXn +aqG tvw mtv eOx @@ -33417,7 +34207,7 @@ pZh pZh jtl aXG -aXG +huK xyz pHQ pZh @@ -33426,7 +34216,7 @@ eOx jtl aXG cVm -dGD +ngU nJp tvw tfe @@ -33437,7 +34227,7 @@ pry bsj chZ dVh -dGD +ngU nJp aDg fVr @@ -33664,9 +34454,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tvw +eGs +aqG tvw bjh cAI @@ -33674,7 +34464,7 @@ mDs xqq tUz uYo -uYo +cHy uYo eNn xqq @@ -33683,7 +34473,7 @@ cAI phk aXG pPI -dGD +ngU nJp tvw tvw @@ -33694,7 +34484,7 @@ hVC bsj uDT tvw -iMY +lBC nJp tvw fVr @@ -33921,9 +34711,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tvw +eXn +aqG tvw aXG aXG @@ -33931,7 +34721,7 @@ eHo hvQ hvQ hvQ -hvQ +bIG hvQ hvQ hvQ @@ -33940,7 +34730,7 @@ aXG aXG jXO cVm -dGD +ngU pSt kOZ ubH @@ -33951,7 +34741,7 @@ bsj bsj bsj tvw -iMY +lBC nJp tvw fVr @@ -34178,9 +34968,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tvw +eXn +jfB tvw aDg uTg @@ -34208,7 +34998,7 @@ bsj bsj bUO tvw -iMY +lBC nJp aDg fVr @@ -34435,9 +35225,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +tvw +tvw +tvw tvw aXG bdI @@ -34454,7 +35244,7 @@ cal aXG tvw oAn -oOC +uUo nJp tvw tvw @@ -34465,7 +35255,7 @@ tvw tvw tvw tvw -iMY +lBC nJp aDg fVr @@ -34711,7 +35501,7 @@ dHD aXG tvw fGC -hvQ +bIG nJp tvw iVr @@ -34722,7 +35512,7 @@ nsT bsj nYF tvw -iMY +lBC nJp aDg rVQ @@ -34968,7 +35758,7 @@ wYH aXG tvw fGC -hvQ +bIG nJp tvw tfe @@ -34979,7 +35769,7 @@ pry bsj chZ wdB -dGD +ngU nJp tvw vLx @@ -35225,7 +36015,7 @@ aXG aXG tvw vsB -hvQ +bIG nJp tvw tvw @@ -35236,7 +36026,7 @@ hVC bsj mUC tvw -iMY +lBC nJp tvw vLx @@ -35473,7 +36263,7 @@ eHo amv tvw aDg -aDg +rCG aDg tvw amv @@ -35482,7 +36272,7 @@ aXG aXG tvw iMY -hvQ +bIG pSt kOZ sga @@ -35493,7 +36283,7 @@ bsj bsj bsj tvw -iMY +lBC nJp tvw vLx @@ -35730,7 +36520,7 @@ inr nrl rYR rYR -rYR +xkb rYR rYR ojv @@ -35738,8 +36528,8 @@ liU aXG gAj tvw -iIb -eYX +wwF +ikj eYX eYX aPe @@ -35995,7 +36785,7 @@ aXG aXG aXG tvw -xyz +qjL dAM dmR tvw @@ -36244,7 +37034,7 @@ aXG aXG aXG aXG -aXG +fLG aXG aXG aXG @@ -36264,7 +37054,7 @@ nsT bsj nYF tvw -iMY +lBC nJp tvw vLx @@ -36521,7 +37311,7 @@ pry bsj chZ yln -dGD +ngU nJp tvw vLx @@ -36778,7 +37568,7 @@ hVC bsj cbF tvw -iMY +lBC nJp tvw aaa @@ -37035,7 +37825,7 @@ bsj bsj bsj tvw -iMY +lBC nJp tvw aaa @@ -37292,7 +38082,7 @@ bsj bsj bUO tvw -iMY +lBC nJp tvw aaa @@ -37806,7 +38596,7 @@ qzE gIO mMu xwC -oOC +uUo nJp tvw aaa @@ -38056,14 +38846,14 @@ kOZ kOZ kOZ oOC -hvQ -hvQ -hvQ -hvQ -hvQ -hvQ -hvQ -hvQ +kNb +oZK +oZK +oZK +oZK +oZK +oZK +uks nJp tvw aaa @@ -61736,7 +62526,7 @@ ayo ahY aqf aUo -aUo +fmr aUo aqf bcb @@ -61993,7 +62783,7 @@ alR aQd aqf aqy -aUo +fmr agr aqf rTU @@ -62250,7 +63040,7 @@ axQ aRM aqf aPK -aUo +fmr awQ aqf sRt @@ -62507,7 +63297,7 @@ aUo aUz aqf aYj -aUo +fmr aKD aqf aqf @@ -62764,7 +63554,7 @@ aME gWT aqf aXd -aUo +fmr aQa aqf dyU @@ -63021,7 +63811,7 @@ aqf aqf aqf aqf -aUo +fmr aqf aPZ dDF @@ -63274,11 +64064,11 @@ asC jZb aqf afr -atf +uoo aOb aSn aIU -aUo +fmr bNi aqf bZt @@ -63514,28 +64304,28 @@ asp aqf lnP aPo -aUo -aUo -aUo -bwG -wDG -aUo -aUz -aTb +ogd +svq +svq +wwq +dkH +svq +qmB +srf aBH -avS -axO +kJA +pxG axO axO aGo enf aqf aHP +fmr aUo aUo aUo -aUo -aUo +fmr jeI aqf aqf @@ -63781,18 +64571,18 @@ aUo aTb ayQ aOI -aOI -aKB +vdA +tIy aWq aDA -sIb -ang -aUo -aUo +iEh +pLK +svq +aKp aWh ahG aGY -aUo +osF jeI aqf dbn @@ -64038,8 +64828,8 @@ aUo aTb apA aOI -aOI -aOI +jCs +pgJ aKB aGo ayk @@ -64296,7 +65086,7 @@ aqf aGT apx apx -apx +rEG apx apx aoR @@ -64553,7 +65343,7 @@ aqf aqf aqf aka -aka +ePa aka aqf aqf @@ -64563,7 +65353,7 @@ aqf agV aUo aUo -aUo +atf aqf aqf ajj @@ -64810,7 +65600,7 @@ aqf pwO wVd aYc -aYc +tuX aYc kZK bON @@ -65067,7 +65857,7 @@ aqf ayt qVU qVU -qVU +wbI qVU qVU aJP @@ -65305,14 +66095,14 @@ aPf aPf ayI aPf -aPf -aPf -aPf -ekp -ayI -ayI -ayI -ayI +vTT +ugp +bif +gLS +joj +joj +joj +joj mfu tsx tsx @@ -65322,11 +66112,11 @@ tsx tsx aBa aqX -qVU +lyP vhm rOn mxd -qVU +rku tct aqf aAX @@ -65562,10 +66352,10 @@ aPf aPf ayI ayI -aPf -aPf -aPf -ekp +vTT +qQv +abV +vTT ayI ayI hea @@ -65578,8 +66368,8 @@ wIO wIO wIO vzb -sUE -vhm +pit +ufE qdG vdW bUS @@ -65819,10 +66609,10 @@ aPf ayI ayI ayI -aPf -aPf -aFP -agU +vTT +qQv +gcJ +vTT mPR uIo aSt @@ -66076,10 +66866,10 @@ ayI ayI ayI aPf -aPf -asX -aFP -agU +vTT +qQv +abV +vTT nXw aSt aSt @@ -66333,10 +67123,10 @@ ayI ayI aPf aPf -aPf -aFP -aFP -agU +vTT +tKS +vTT +vTT nXw aIr aIr diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index 29154fe011b..dc1749973eb 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -42,3 +42,6 @@ _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm + +##MEGAFAUNA +#_maps/RandomRuins/LavaRuins/nova/lavaland_surface_arena.dmm diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index bf149ca5640..e42b0d918e7 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -72,7 +72,7 @@ #_maps/RandomRuins/SpaceRuins/space_billboard.dmm #_maps/RandomRuins/SpaceRuins/space_billboard.dmm #_maps/RandomRuins/SpaceRuins/space_ghost_restaurant.dmm -#_maps/RandomRuins/SpaceRuins/spacehotel.dmm +_maps/RandomRuins/SpaceRuins/spacehotel.dmm #_maps/RandomRuins/SpaceRuins/spinwardsmoothies.dmm #_maps/RandomRuins/SpaceRuins/spinwardsmoothies.dmm #_maps/RandomRuins/SpaceRuins/the_faceoff.dmm @@ -88,5 +88,33 @@ #_maps/RandomRuins/SpaceRuins/waystation.dmm #_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm + +##Custom Ruins +#_maps/RandomRuins/SpaceRuins/nova/alientoollab.dmm +#_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm +#_maps/RandomRuins/SpaceRuins/nova/cargodiselost.dmm +#_maps/RandomRuins/SpaceRuins/nova/clothing_facility.dmm +#_maps/RandomRuins/SpaceRuins/nova/codealpha.dmm +#_maps/RandomRuins/SpaceRuins/nova/crash.dmm +#_maps/RandomRuins/SpaceRuins/nova/derelictferry.dmm +#_maps/RandomRuins/SpaceRuins/nova/des_two.dmm #_maps/RandomRuins/SpaceRuins/nova/drones_derelict.dmm -#_maps/RandomRuins/SpaceRuins/shuttle8532.dmm +#_maps/RandomRuins/SpaceRuins/nova/ghostship.dmm +#_maps/RandomRuins/SpaceRuins/nova/luna.dmm +#_maps/RandomRuins/SpaceRuins/nova/piratefort.dmm +#_maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm +#_maps/RandomRuins/SpaceRuins/nova/posterpandamonium.dmm +#_maps/RandomRuins/SpaceRuins/nova/prisonshuttle.dmm +#_maps/RandomRuins/SpaceRuins/nova/salvagepost.dmm +#_maps/RandomRuins/SpaceRuins/nova/scrapeheap.dmm +#_maps/RandomRuins/SpaceRuins/nova/shuttle8532.dmm +#_maps/RandomRuins/SpaceRuins/nova/shuttlescrap.dmm +#_maps/RandomRuins/SpaceRuins/nova/smugglies.dmm +#_maps/RandomRuins/SpaceRuins/nova/spacehotel.dmm +#_maps/RandomRuins/SpaceRuins/nova/syndibase.dmm +#_maps/RandomRuins/SpaceRuins/nova/toystore.dmm +#_maps/RandomRuins/SpaceRuins/nova/vaulttango.dmm +#_maps/RandomRuins/SpaceRuins/nova/waypointstation.dmm +#_maps/RandomRuins/SpaceRuins/nova/whiteshipruin_box.dmm +#_maps/RandomRuins/SpaceRuins/nova/wreckedfriendship.dmm +#_maps/RandomRuins/SpaceRuins/nova/wreckedhomestead.dmm diff --git a/modular_nova/master_files/code/modules/clothing/neck/_neck.dm b/modular_nova/master_files/code/modules/clothing/neck/_neck.dm new file mode 100644 index 00000000000..c062f7597c3 --- /dev/null +++ b/modular_nova/master_files/code/modules/clothing/neck/_neck.dm @@ -0,0 +1,3 @@ +//DEFAULT NECK ITEMS OVERRIDE// +/obj/item/clothing/neck + w_class = WEIGHT_CLASS_SMALL diff --git a/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm index 59a52c87335..4f621b656e6 100644 --- a/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm @@ -28,7 +28,7 @@ /obj/item/stack/sheet/sinew, ) ritual_success_items = list( - /obj/item/clothing/neck/necklace/ashwalker, + /obj/item/clothing/neck/necklace/translator, ) /datum/ash_ritual/summon_key diff --git a/modular_nova/modules/gladiator/code/datums/ruins/lavaland.dm b/modular_nova/modules/gladiator/code/datums/ruins/lavaland.dm deleted file mode 100644 index 0703d375fee..00000000000 --- a/modular_nova/modules/gladiator/code/datums/ruins/lavaland.dm +++ /dev/null @@ -1,9 +0,0 @@ -/datum/map_template/ruin/lavaland/arena - name = "Grand Arena" - id = "arena" - description = "An ancient gladitorial arena containing a deadly warrior within." - prefix = "_maps/RandomRuins/LavaRuins/nova/" - suffix = "lavaland_surface_arena.dmm" - cost = 0 - always_place = TRUE //WOULD BE UNFAIR IF SOMETHING THAT IS ALWAYS PLACED HAD A COST... - allow_duplicates = FALSE diff --git a/modular_nova/modules/mapping/code/icemoon.dm b/modular_nova/modules/mapping/code/icemoon.dm index bf39280cc9d..d00ce32aed8 100644 --- a/modular_nova/modules/mapping/code/icemoon.dm +++ b/modular_nova/modules/mapping/code/icemoon.dm @@ -4,7 +4,7 @@ /*------*/ /datum/map_template/ruin/icemoon/underground/nova/mining_site_below - name = "Mining Site Underground" + name = "Ice-ruin Mining Site Underground" id = "miningsite-underground" description = "The Iceminer arena." prefix = "_maps/RandomRuins/IceRuins/nova/" @@ -12,7 +12,7 @@ always_place = TRUE /datum/map_template/ruin/icemoon/underground/nova/interdyne_base - name = "Interdyne Pharmaceuticals Nova Sector Base 8817238" + name = "Ice-ruin Interdyne Pharmaceuticals Nova Sector Base 8817238" id = "ice-base" description = "A planetside Interdyne research facility developing biological weapons; it is closely guarded by an elite team of agents." prefix = "_maps/RandomRuins/IceRuins/nova/" diff --git a/modular_nova/modules/mapping/code/lavaland.dm b/modular_nova/modules/mapping/code/lavaland.dm index 3863e2283ff..f99824e0d9f 100644 --- a/modular_nova/modules/mapping/code/lavaland.dm +++ b/modular_nova/modules/mapping/code/lavaland.dm @@ -4,7 +4,7 @@ /*------*/ /datum/map_template/ruin/lavaland/ash_walker - name = "Ash Walker Nest" + name = "Lava-Ruin Ash Walker Nest" id = "ash-walker" description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? \ Probably best to stay clear." @@ -14,7 +14,7 @@ allow_duplicates = FALSE /datum/map_template/ruin/lavaland/nova/interdyne_base - name = "Interdyne Pharmaceutics Nova Sector Base 3c76928" + name = "Lava-Ruin Interdyne Pharmaceutics Nova Sector Base 3c76928" id = "lava-base" description = "A planetside Interdyne research facility developing biological weapons; it is closely guarded by an elite team of agents." prefix = "_maps/RandomRuins/LavaRuins/nova/" @@ -23,3 +23,12 @@ never_spawn_with = list(/datum/map_template/ruin/icemoon/underground/nova/interdyne_base) unpickable = TRUE //FF REMOVAL - INTERDYNE-REMAP. ORIGINAL always_place = TRUE +/datum/map_template/ruin/lavaland/arena + name = "Lava-Ruin Grand Arena" + id = "arena" + description = "An ancient gladitorial arena containing a deadly warrior within." + prefix = "_maps/RandomRuins/LavaRuins/nova/" + suffix = "lavaland_surface_arena.dmm" + cost = 0 + always_place = TRUE //WOULD BE UNFAIR IF SOMETHING THAT IS ALWAYS PLACED HAD A COST... + allow_duplicates = FALSE diff --git a/modular_nova/modules/mapping/code/mob_spawns.dm b/modular_nova/modules/mapping/code/mob_spawns.dm index 9fd74f012d5..ce6eef78ac0 100644 --- a/modular_nova/modules/mapping/code/mob_spawns.dm +++ b/modular_nova/modules/mapping/code/mob_spawns.dm @@ -532,6 +532,7 @@ /datum/id_trim/away/hotel/security assignment = "Hotel Security" + access = list(ACCESS_TWIN_NEXUS_STAFF, ACCESS_TWIN_NEXUS_MANAGER) //CRYO CONSOLES diff --git a/modular_nova/modules/mapping/code/space.dm b/modular_nova/modules/mapping/code/space.dm index f6e4f135e42..1bb749b8a77 100644 --- a/modular_nova/modules/mapping/code/space.dm +++ b/modular_nova/modules/mapping/code/space.dm @@ -5,9 +5,8 @@ /datum/map_template/ruin/space/whiteshipruin_box_nova/ id = "whiteshipruin_box_nova" - prefix = "_maps/RandomRuins/SpaceRuins/nova/" suffix = "whiteshipruin_box.dmm" - name = "NT Medical Ship" + name = "Space-Ruin NT Medical Ship" description = "An ancient ship, said to be among the first discovered derelicts near Space Station 13 that was still in working order. \ Aged and deprecated by time, this relic of a vessel is now broken beyond repair." @@ -15,164 +14,158 @@ id = "spacehotel" prefix = "_maps/RandomRuins/SpaceRuins/nova/" suffix = "spacehotel.dmm" - name = "The Twin-Nexus Hotel" + name = "Space-Ruin The Twin-Nexus Hotel" description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." /datum/map_template/ruin/space/nova/des_two - name = "DS-2" id = "des_two" - description = "If DS-1 was so good..." suffix = "des_two.dmm" + name = "Space-Ruin DS-2" + description = "If DS-1 was so good..." always_place = TRUE /datum/map_template/ruin/space/nova/derelictferry id = "derelictferry" suffix = "derelictferry.dmm" - name = "Derelict Ferry" + name = "Space-Ruin Derelict Ferry" description = "Clearly once a ferry fielded by Central Command to send their staff to nearby stations, this ship's seen better days." /datum/map_template/ruin/space/nova/posterpandamonium id = "posterpandamonium" suffix = "posterpandamonium.dmm" - name = "Abandoned Outpost" + name = "Space-Ruin Abandoned Outpost" description = "Whilst nicely furnished and filled with all sorts of posters, whoever once lived here seems long gone." /datum/map_template/ruin/space/nova/prisonshuttle id = "prisonshuttle" suffix = "prisonshuttle.dmm" - name = "Partisan Shuttle" + name = "Space-Ruin Partisan Shuttle" description = "You can faintly hear hardbass." /datum/map_template/ruin/space/nova/toystore id = "toystore" suffix = "toystore.dmm" - name = "Toy Store" + name = "Space-Ruin Toy Store" description = "A once state-of-the-art store, now left derelict after the company behind it went bankrupt. Maybe they shouldn't have picked such a remote location." /datum/map_template/ruin/space/nova/waypointstation id = "waypointstation" suffix = "waypointstation.dmm" - name = "Waypoint Station" + name = "Space-Ruin Waypoint Station" description = "Previously used as a refueling stop for larger ships, unintentional syndicate intervention has turned this station into a combat zone." /datum/map_template/ruin/space/nova/alientoollab id = "alientoollab" suffix = "alientoollab.dmm" - name = "Abductor Replication Facility" + name = "Space-Ruin Abductor Replication Facility" description = "A mad doctor's dreams were dashed when he finally disclosed to both his funders that each other existed, leaving behind his work for the looters." /datum/map_template/ruin/space/nova/codealpha id = "codealpha" suffix = "codealpha.dmm" - name = "Code Alpha Supplementary Station" + name = "Space-Ruin Code Alpha Supplementary Station" description = "The mess hall of a once bustling supplementary station, to be deployed alongside SS13." /datum/map_template/ruin/space/nova/smugglies //Excuse me sir, do you have money printers in here? id = "smugglies" suffix = "smugglies.dmm" - name = "Suspicious Cargo Installation" + name = "Space-Ruin Suspicious Cargo Installation" description = "*SCREECH* RDM RDM RDM" /datum/map_template/ruin/space/nova/clothing_facility id = "clothing_facility" suffix = "clothing_facility.dmm" - name = "Abandoned Clothing Facility" + name = "Space-Ruin Abandoned Clothing Facility" description = "A den of bad ideas. Secborgs were made here!" /datum/map_template/ruin/space/nova/luna id = "luna" suffix = "luna.dmm" - name = "Luna" + name = "Space-Ruin Luna" description = "Please note for ethical concerns all experimentation regarding writing artificial intelligence units to beleive they are A, A fictional character and B, human have been suspended. Have a pleasant shift." /datum/map_template/ruin/space/nova/blackmarket id = "blackmarket" suffix = "blackmarket.dmm" - name = "Shady Market" + name = "Space-Ruin Shady Market" description = "Whaddya buyin'?" /datum/map_template/ruin/space/nova/shuttle8532 id = "shuttle8532" suffix = "shuttle8532.dmm" - name = "Shuttle 8532" + name = "Space-Ruin Shuttle 8532" description = "While nobody can predict what space has to offer for the sailors that ride its waves, nobody is quite expecting a meteroid half the size of your shuttle to split it in half." /datum/map_template/ruin/space/nova/ghostship id = "ghostship" suffix = "ghostship.dmm" - name = "Ghost Ship" + name = "Space-Ruin Ghost Ship" description = "An ancient ship, seemingly pre-bluespace in design yet retrofitted with newer systems. Seemingly just up-and-abandoned in the middle of space..." /datum/map_template/ruin/space/nova/salvagepost id = "salvagepost" suffix = "salvagepost.dmm" - name = "Pre-Bluespace Salvage Post" + name = "Space-Ruin Pre-Bluespace Salvage Post" description = "An extremely old, long forgotten post used to salvage damaged or decommissioned ships before bluespace transportation. Surprising its stayed intact so long." /datum/map_template/ruin/space/nova/vaulttango id = "vaulttango" suffix = "vaulttango.dmm" - name = "ARBORLINK Vault Tango" + name = "Space-Ruin ARBORLINK Vault Tango" description = "Nanotrasen isn't the only corporation experimenting in advanced bluespace technology." /datum/map_template/ruin/space/nova/friendship id = "friendship" suffix = "wreckedfriendship.dmm" - name = "NTSS Friendship" + name = "Space-Ruin NTSS Friendship" description = "120 people.. one ship. It's unsurprising." /datum/map_template/ruin/space/nova/homestead id = "homestead" suffix = "wreckedhomestead.dmm" - name = "NTSS Homestead" + name = "Space-Ruin NTSS Homestead" description = "A wrecked ship." -/datum/map_template/ruin/space/nova/medieval1 - id = "medieval1" - suffix = "medieval1.dmm" - name = "Medieval 1" - description = "A forgotten peice of history left overrun with a reminder of what brought its destruction" - /datum/map_template/ruin/space/nova/cargodiselost id = "CargodiseLost" suffix = "cargodiselost.dmm" - name = "Cargodise Lost" + name = "Space-Ruin Cargodise Lost" description = "A small crew of freight-haulers are marooned in space after pirates knock out their engines. They must survive off of the cargo on board their ship and fend off the pirate boarders on their ship." /datum/map_template/ruin/space/nova/infestedntship + id = "scrapheap" suffix = "scrapheap.dmm" - name = "NT Research Vessel" + name = "Space-Ruin NT Research Vessel" description = "A zombie-infested NT ship, seemingly dedicated to medical research." /datum/map_template/ruin/space/nova/piratefort + id = "piratefort" suffix = "piratefort.dmm" - name = "Pirate Fort" + name = "Space-Ruin Pirate Fort" description = "A pirate hideout in deep space." /datum/map_template/ruin/space/nova/syndibase + id = "syndibase" suffix = "syndibase.dmm" - name = "Syndicate Outpost" + name = "Space-Ruin Syndicate Outpost" description = "A Syndicate research outpost in deep space." /datum/map_template/ruin/space/nova/crash + id = "crash" suffix = "crash.dmm" - name = "Crashed Boat" + name = "Space-Ruin Crashed Boat" description = "A small ferry crashed into an asteroid." /datum/map_template/ruin/space/nova/shuttlescrap + id = "shuttlescrap" suffix = "shuttlescrap.dmm" - name = "Broken Shuttle" + name = "Space-Ruin Broken Shuttle" description = "A small shuttle that clearly got clipped by something." -/datum/map_template/ruin/space/nova/gorilla - suffix = "gorilla.dmm" - name = "Gorilla" - description = "There is no need to be upset." - /datum/map_template/ruin/space/nova/escapefromtarkon - suffix = "port_tarkon.dmm" - name = "Port Tarkon" id = "escapefromtarkon" + suffix = "port_tarkon.dmm" + name = "Space-Ruin Port Tarkon" description = "An ambitious goal, A step forward, A trial run for the Tarkon drill, ment to implant mining stations within meteors. Decades of disaster have, however, left this one... Unattended for far too long." always_place = TRUE diff --git a/modular_nova/modules/modular_items/code/necklace.dm b/modular_nova/modules/modular_items/code/necklace.dm index 4e87508dd4f..b64cbcceed2 100644 --- a/modular_nova/modules/modular_items/code/necklace.dm +++ b/modular_nova/modules/modular_items/code/necklace.dm @@ -1,10 +1,6 @@ -//DEFAULT NECK ITEMS OVERRIDE// -/obj/item/clothing/neck - w_class = WEIGHT_CLASS_SMALL - -//ASHWALKER TRANSLATOR NECKLACE// +//TRANSLATOR NECKLACE// #define LANGUAGE_TRANSLATOR "translator" -/obj/item/clothing/neck/necklace/ashwalker +/obj/item/clothing/neck/necklace/translator/ name = "ashen necklace" desc = "A necklace crafted from ash, connected to the Necropolis through the core of a Legion. This imbues overdwellers with an unnatural understanding of Ashtongue, the native language of Lavaland, while worn." icon = 'modular_nova/master_files/icons/obj/clothing/neck.dmi' @@ -12,23 +8,49 @@ worn_icon = 'modular_nova/master_files/icons/mob/clothing/neck.dmi' icon_state = "ashnecklace" w_class = WEIGHT_CLASS_SMALL //allows this to fit inside of pockets. + /// The language granted by this necklace + var/datum/language/language_granted = /datum/language/ashtongue + /// Where the power comes from + var/power_source = "the Necropolis" + /// Whether or not to display the message upon equipping/unequipping + var/silent -//uses code from the pirate hat. -/obj/item/clothing/neck/necklace/ashwalker/equipped(mob/user, slot) +/obj/item/clothing/neck/necklace/translator/Initialize(mapload) . = ..() - if(!ishuman(user)) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(on_necklace_equip)) + +/obj/item/clothing/neck/necklace/translator/proc/on_necklace_equip(datum/source, mob/living/carbon/human/equipper, slot) + SIGNAL_HANDLER + + if(!(slot & ITEM_SLOT_NECK)) return - if(slot & ITEM_SLOT_NECK) - user.grant_language(/datum/language/ashtongue/, source = LANGUAGE_TRANSLATOR) - to_chat(user, span_boldnotice("Slipping the necklace on, you feel the insidious creep of the Necropolis enter your bones, and your very shadow. You find yourself with an unnatural knowledge of Ashtongue; but the amulet's eye stares at you.")) -/obj/item/clothing/neck/necklace/ashwalker/dropped(mob/user) - . = ..() - if(!ishuman(user)) + if(!istype(equipper)) return - var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(ITEM_SLOT_NECK) == src && !QDELETED(src)) //This can be called as a part of destroy - user.remove_language(/datum/language/ashtongue/, source = LANGUAGE_TRANSLATOR) - to_chat(user, span_boldnotice("You feel the alien mind of the Necropolis lose its interest in you as you remove the necklace. The eye closes, and your mind does as well, losing its grasp of Ashtongue.")) -//ASHWALKER TRANSLATOR NECKLACE END// + equipper.grant_language(language_granted, source = LANGUAGE_TRANSLATOR) + RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(on_necklace_unequip)) + + if(!silent) + to_chat(equipper, span_boldnotice("Slipping the necklace on, you feel the insidious creep of [power_source] enter your bones, your very shadow and soul. You find yourself with an unnatural knowledge of the [initial(language_granted.name)]; but the amulet's eye stares back at you with a gleeful intent. Causing you to shiver with unease, you don't want to keep this on forever.")) + +/obj/item/clothing/neck/necklace/translator/proc/on_necklace_unequip(obj/item/source, mob/living/carbon/human/unequipper) + SIGNAL_HANDLER + + if(!istype(unequipper)) + return + + if(unequipper.wear_neck != source) + return + + unequipper.remove_language(language_granted, source = LANGUAGE_TRANSLATOR) + UnregisterSignal(source, COMSIG_ITEM_DROPPED) + + if(!silent) + to_chat(unequipper, span_boldnotice("You feel the alien mind of [power_source] lose its interest in you as you remove the necklace. The eye closes, and your mind does as well, losing its grasp of [initial(language_granted.name)]")) + +/obj/item/clothing/neck/necklace/translator/hearthkin + name = "gemmed necklace" + desc = "A necklace crafted from a gem found in the frozen wastes. This imbues overdwellers with an unnatural understanding of the Hearthkin while worn." + language_granted = /datum/language/siiktajr + power_source = "a dark nature" diff --git a/modular_nova/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm b/modular_nova/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm index 037d1949327..2bfb3102c66 100644 --- a/modular_nova/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm +++ b/modular_nova/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm @@ -67,7 +67,8 @@ GLOBAL_LIST_INIT(clothing_reward, list( /obj/item/clothing/under/costume/gladiator/ash_walker/robe = 1, /obj/item/clothing/under/costume/gladiator/ash_walker/tribal = 1, /obj/item/clothing/under/costume/gladiator/ash_walker/white = 1, - /obj/item/clothing/neck/necklace/ashwalker = 1, + /obj/item/clothing/neck/necklace/translator = 1, + /obj/item/clothing/neck/necklace/translator/hearthkin = 1, /obj/item/clothing/head/helmet/gladiator = 1, /obj/item/clothing/under/costume/gladiator/ash_walker = 1, )) diff --git a/tgstation.dme b/tgstation.dme index 2bce85421f1..ff78bb773fe 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6394,6 +6394,7 @@ #include "modular_nova\master_files\code\modules\clothing\head\cowboy.dm" #include "modular_nova\master_files\code\modules\clothing\head\monkey_magnification_helmet.dm" #include "modular_nova\master_files\code\modules\clothing\masks\_masks.dm" +#include "modular_nova\master_files\code\modules\clothing\neck\_neck.dm" #include "modular_nova\master_files\code\modules\clothing\outfits\ert.dm" #include "modular_nova\master_files\code\modules\clothing\outfits\standard.dm" #include "modular_nova\master_files\code\modules\clothing\shoes\bananashoes.dm" @@ -7288,7 +7289,6 @@ #include "modular_nova\modules\ghostcafe\code\ghostcafeturf.dm" #include "modular_nova\modules\ghostcafe\code\hilbertshotel_ghost.dm" #include "modular_nova\modules\ghostcafe\code\robot_ghostcafe.dm" -#include "modular_nova\modules\gladiator\code\datums\ruins\lavaland.dm" #include "modular_nova\modules\gladiator\code\game\objects\items\gladiator_items.dm" #include "modular_nova\modules\gladiator\code\modules\mob\living\simple_animal\hostile\megafauna\markedone.dm" #include "modular_nova\modules\goofsec\code\cellphone.dm"