diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index b23f24b0e9..49646fbd71 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -151,6 +151,7 @@ id_tag = "syndie_listeningpost_external"; req_access_txt = "150" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) "aq" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5e39144502..6dd7a4fc18 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -13176,6 +13176,9 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/old, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/security/courtroom) "avX" = ( @@ -43673,10 +43676,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/maintenance/central/secondary) -"bsm" = ( -/obj/machinery/status_display/evac, -/turf/open/floor/plasteel, -/area/engine/supermatter) "bsn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -62893,9 +62892,9 @@ pixel_x = 24 }, /obj/machinery/button/electrochromatic{ + id = "!interrogation_room"; pixel_x = 38; - pixel_y = -5; - id = "!interrogation_room" + pixel_y = -5 }, /turf/open/floor/plasteel, /area/security/warden) @@ -84681,9 +84680,6 @@ }, /area/security/vacantoffice) "fyr" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/closed/mineral/random/labormineral, /area/space/nearstation) @@ -84940,10 +84936,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall/rust, /area/ai_monitored/turret_protected/ai_upload) -"jPE" = ( -/obj/structure/cable, -/turf/closed/mineral/random/labormineral, -/area/space/nearstation) "jQY" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -119968,7 +119960,7 @@ ckw cmw xON axa -jPE +aeu aeu aeU dQe @@ -121752,7 +121744,7 @@ clM axW cnk coo -ayn +axU aLH aLx aLz @@ -122272,7 +122264,7 @@ aLF aag aag aag -bsm +aLF cuA cuW bYI diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index df7f015c87..9caf916cfe 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -39225,7 +39225,7 @@ dir = 4 }, /obj/machinery/computer/station_alert, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ @@ -39245,7 +39245,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/atmospherics, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, /turf/open/floor/plasteel/dark/corner{ @@ -39262,10 +39262,10 @@ dir = 4 }, /obj/structure/closet/secure_closet/atmospherics, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -39278,9 +39278,6 @@ pixel_y = 24 }, /obj/machinery/computer/atmos_control, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /turf/open/floor/plasteel/checker, /area/engine/atmos) "byW" = ( @@ -39294,7 +39291,7 @@ dir = 4 }, /obj/machinery/computer/atmos_control, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, /turf/open/floor/plasteel/checker, @@ -39313,12 +39310,12 @@ pixel_x = -26 }, /obj/machinery/pipedispenser/disposal/transit_tube, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "byY" = ( @@ -39326,7 +39323,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, /turf/open/floor/plasteel, @@ -39339,14 +39336,14 @@ dir = 8 }, /obj/machinery/pipedispenser, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Atmospherics - Entrance"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bza" = ( @@ -42605,7 +42602,7 @@ name = "Distribution Loop"; req_access_txt = "24" }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/engine/atmos) "bFQ" = ( @@ -44666,19 +44663,19 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bKy" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, /turf/closed/wall, /area/engine/atmos) "bKz" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 }, /turf/closed/wall, /area/engine/atmos) "bKA" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall, /area/engine/atmos) "bKB" = ( @@ -45401,7 +45398,7 @@ /area/engine/atmos) "bMe" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plating, /area/engine/atmos) "bMf" = ( @@ -64903,10 +64900,8 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/structure/closet/l3closet/scientist{ - pixel_x = -2 - }, /obj/effect/turf_decal/stripes/line, +/obj/structure/closet/bombcloset, /turf/open/floor/plasteel, /area/science/mixing) "cyA" = ( @@ -64937,7 +64932,6 @@ "cyD" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/stripes/line, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) "cyE" = ( @@ -64949,7 +64943,6 @@ network = list("ss13","rd") }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) @@ -64982,7 +64975,9 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/plasteel, /area/science/mixing) "cyI" = ( @@ -64998,11 +64993,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/mixing) "cyK" = ( /turf/closed/wall/r_wall, @@ -65413,10 +65404,14 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "czB" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel, /area/science/mixing) "czC" = ( @@ -66094,12 +66089,15 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "cAG" = ( -/obj/structure/window/reinforced, -/obj/machinery/portable_atmospherics/scrubber, -/obj/item/storage/firstaid/toxin, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 }, +/obj/machinery/camera{ + c_tag = "Toxins - Mixing Area"; + dir = 8; + network = list("ss13","rd") + }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, /area/science/mixing) "cAH" = ( @@ -66814,10 +66812,10 @@ /turf/open/floor/plasteel/white, /area/science/research) "cCt" = ( -/obj/structure/closet/bombcloset, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) "cCu" = ( @@ -67974,19 +67972,14 @@ dir = 1; pixel_y = 2 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /turf/open/floor/plasteel, /area/science/mixing) "cEz" = ( -/obj/structure/closet/wardrobe/grey, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/portable_atmospherics/scrubber, +/obj/item/storage/firstaid/toxin, +/turf/open/floor/plasteel, +/area/science/mixing) "cEA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -68371,18 +68364,7 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "cFs" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Toxins - Mixing Area"; - dir = 8; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/science/mixing) "cFu" = ( @@ -68868,9 +68850,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel, /area/science/mixing) @@ -70101,9 +70080,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cIm" = ( @@ -79544,15 +79521,15 @@ }, /area/medical/medbay/aft) "diP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "diQ" = ( @@ -80266,9 +80243,7 @@ pixel_y = -24 }, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAh" = ( @@ -81343,6 +81318,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"gGH" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "gGT" = ( /obj/effect/landmark/start/scientist, /obj/structure/chair/office/light{ @@ -82261,6 +82243,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"pVL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "pZb" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -117144,16 +117135,16 @@ cvX cwY crR cyJ -czB -cAG +cBs +cBs cBB cCC cDp +czB +cAG +cEz cyK -cyK -cyK -cyK -cPe +dxQ dvY cJY cKM @@ -117407,9 +117398,9 @@ cBC cyK cyK cyK -dvY -dyc -cub +cyK +cyK +cyK diP dvY cJZ @@ -117665,9 +117656,9 @@ cCD uun rSL dvY -cEz -dxQ dyc +gGH +pVL dvY cKa cKO diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index a1c9c07067..70e5459ea8 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -1,4 +1,309 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aaa" = ( +/obj/effect/landmark/event_spawn, +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/kitchen) +"aab" = ( +/obj/structure/curtain, +/obj/machinery/shower{ + pixel_y = 20 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/dorms) +"aac" = ( +/obj/machinery/shower{ + pixel_y = 20 + }, +/obj/structure/curtain, +/turf/open/floor/plasteel/white, +/area/crew_quarters/dorms) +"aad" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 30 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) +"aae" = ( +/obj/machinery/button/door{ + id = "Bath1"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 24; + pixel_y = -5; + specialfunctions = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/toilet/secret/low_loot{ + pixel_y = 14 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) +"aaf" = ( +/obj/machinery/light, +/obj/structure/urinal{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/dorms) +"aag" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/mob/living/carbon/monkey/punpun, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/bar) +"aah" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson{ + pixel_y = 4 + }, +/obj/item/cartridge/atmos, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 27 + }, +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/mob/living/simple_animal/parrot/Poly, +/turf/open/floor/plasteel, +/area/crew_quarters/heads/chief) +"aai" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/mob/living/simple_animal/sloth/paperwork, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"aaj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #1" + }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/starboard"; + dir = 4; + name = "Starboard Maintenance APC"; + pixel_x = 26 + }, +/mob/living/simple_animal/bot/mulebot{ + beacon_freq = 1400; + home_destination = "QM #1"; + suffix = "#1" + }, +/turf/open/floor/pod/dark, +/area/maintenance/starboard) +"aak" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #2" + }, +/obj/machinery/camera{ + c_tag = "Cargo Garage"; + dir = 8 + }, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #2"; + suffix = "#2" + }, +/turf/open/floor/pod/dark, +/area/maintenance/starboard) +"aal" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Chief Medical Office"; + dir = 8; + network = list("ss13","medbay"); + pixel_y = -22 + }, +/mob/living/simple_animal/pet/cat/Runtime, +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) +"aam" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 1 + }, +/mob/living/simple_animal/mouse/brown/Tom, +/turf/open/floor/plasteel/dark, +/area/security/prison) +"aan" = ( +/obj/machinery/camera{ + c_tag = "Head of Security's Office"; + dir = 8 + }, +/obj/structure/bed/dogbed{ + desc = "A comfy-looking pet bed. You can even strap your pet in, in case the gravity turns off."; + name = "pet bed" + }, +/obj/item/storage/secure/safe/HoS{ + pixel_x = 35 + }, +/mob/living/simple_animal/hostile/retaliate/bat/secbat{ + desc = "An adorable fruit bat with a cute little hat, may or may not have a reputation for biting out eyeballs, or at least that's what the HoS'd tell you."; + name = "Colonel Chomps" + }, +/turf/open/floor/carpet, +/area/crew_quarters/heads/hos) +"aao" = ( +/obj/structure/closet/emcloset/anchored, +/obj/structure/sign/directions/medical{ + dir = 8; + icon_state = "direction_med"; + pixel_y = 36 + }, +/obj/structure/sign/directions/science{ + dir = 8; + icon_state = "direction_sci"; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"aap" = ( +/obj/machinery/quantumpad{ + map_pad_id = "5"; + map_pad_link_id = "6" + }, +/obj/structure/sign/directions/evac{ + pixel_y = 40 + }, +/obj/structure/sign/directions/security{ + pixel_y = 32 + }, +/obj/structure/sign/directions/command{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"aaq" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/sign/directions/supply{ + pixel_x = 32; + pixel_y = -36 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_x = 32; + pixel_y = -28 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"aar" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/departments/botany, +/turf/open/floor/plating, +/area/hydroponics) +"aas" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/engineering, +/turf/open/floor/plating, +/area/engine/engineering) +"aat" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/power/apc{ + areastring = "/area/hallway/primary/fore"; + dir = 1; + name = "Fore Primary Hallway APC"; + pixel_y = 24 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_x = 0; + pixel_y = 40 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"aau" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/sign/departments/custodian{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) +"aav" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "aaw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11,10 +316,198 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"aax" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/departments/cargo, +/turf/open/floor/plating, +/area/quartermaster/storage) +"aay" = ( +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, +/obj/structure/sign/departments/cargo{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"aaz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/directions/engineering{ + dir = 1; + icon_state = "direction_eng"; + pixel_x = 32; + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"aaA" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/warning/pods{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, +/area/hallway/primary/port) +"aaB" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/departments/chemistry{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"aaC" = ( +/obj/structure/sign/directions/medical{ + dir = 8; + icon_state = "direction_med"; + pixel_y = 36 + }, +/obj/structure/sign/directions/science{ + dir = 8; + icon_state = "direction_sci"; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"aaD" = ( +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_y = 36 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + icon_state = "direction_supply"; + pixel_x = 0; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"aaE" = ( +/obj/structure/sign/directions/evac{ + pixel_x = -32; + pixel_y = -24 + }, +/obj/structure/sign/directions/security{ + pixel_x = -32; + pixel_y = -32 + }, +/obj/structure/sign/directions/command{ + pixel_x = -32; + pixel_y = -40 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"aaF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/sign/departments/science{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"aaG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/sign/directions/medical{ + dir = 8; + icon_state = "direction_med"; + pixel_y = 40 + }, +/obj/structure/sign/directions/science{ + dir = 8; + icon_state = "direction_sci"; + pixel_y = 32 + }, +/obj/structure/sign/directions/security{ + pixel_y = 24 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "aaH" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, /area/medical/chemistry) +"aaI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_y = 40 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + icon_state = "direction_supply"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/structure/sign/directions/evac{ + pixel_y = 24 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) +"aaJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/departments/evac, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) +"aaK" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_x = 0; + pixel_y = 40 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 4 + }, +/area/hallway/secondary/exit/departure_lounge) +"aaL" = ( +/obj/structure/sign/departments/restroom{ + pixel_x = 32; + pixel_y = 32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/fitness/recreation) "aaM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/components/binary/valve{ @@ -22,6 +515,24 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"aaN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/quantumpad{ + map_pad_id = "1"; + map_pad_link_id = "2" + }, +/obj/structure/sign/directions/medical{ + dir = 8; + icon_state = "direction_med"; + pixel_y = 36 + }, +/obj/structure/sign/directions/science{ + dir = 8; + icon_state = "direction_sci"; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "aaO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -36,13 +547,155 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"aaQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/computer/shuttle/snow_taxi, +/obj/structure/sign/directions/supply{ + dir = 4; + icon_state = "direction_supply"; + pixel_x = 0; + pixel_y = 36 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) +"aaR" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aaS" = ( /turf/closed/wall/r_wall, /area/medical/surgery) +"aaT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"aaU" = ( +/obj/structure/sign/departments/restroom{ + pixel_x = 32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"aaV" = ( +/obj/structure/sign/directions/evac{ + dir = 1; + icon_state = "direction_evac"; + pixel_y = 8 + }, +/obj/structure/sign/directions/security{ + dir = 8; + icon_state = "direction_sec"; + pixel_x = 0; + pixel_y = 0 + }, +/obj/structure/sign/directions/command{ + dir = 8; + icon_state = "direction_bridge"; + pixel_y = -8 + }, +/turf/closed/wall/r_wall, +/area/hallway/primary/central) +"aaW" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/security, +/turf/open/floor/plating, +/area/hallway/primary/central) +"aaX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"aaY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"aaZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/sign/mining{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "aba" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/surgery) +"abb" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abc" = ( +/obj/structure/sign/directions/command{ + pixel_x = 32; + pixel_y = -40 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + icon_state = "direction_supply"; + pixel_x = 32; + pixel_y = -24 + }, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abd" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "abe" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -52,14 +705,308 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"abf" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abg" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/radio/intercom{ + pixel_y = -26 + }, +/obj/structure/sign/departments/xenobio{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/science/misc_lab) +"abi" = ( +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/departments/holy{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "abk" = ( /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"abl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/holy{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/directions/evac{ + dir = 8; + icon_state = "direction_evac"; + pixel_x = 32; + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abn" = ( +/obj/structure/sign/poster/official/ian, +/turf/closed/wall, +/area/crew_quarters/heads/hop) +"abo" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/sign/poster/official/build{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/storage/primary) +"abp" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/brown, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/filingcabinet, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"abq" = ( +/obj/structure/toilet{ + contents = newlist(/obj/item/toy/snappop/phoenix); + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/turf/open/floor/plasteel/freezer, +/area/hallway/primary/port) +"abr" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/freezer, +/area/hallway/primary/port) "abs" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"abt" = ( +/obj/machinery/door/airlock{ + name = "Unisex Restroom" + }, +/turf/open/floor/plasteel/freezer, +/area/hallway/primary/port) +"abu" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/departments/restroom{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"abv" = ( +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Hydroponics North" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/hydroponics) +"abw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/high_class_martini{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"abx" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = -32 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"aby" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/computer/arcade/minesweeper{ + dir = 8 + }, +/obj/structure/sign/poster/official/nanomichi_ad{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"abz" = ( +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/obj/structure/sign/poster/official/fruit_bowl{ + pixel_y = -32 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) +"abA" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/sign/poster/official/fashion{ + pixel_y = -32 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"abB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/sign/poster/official/report_crimes{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"abC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/external{ + req_one_access_txt = "13,8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/maintenance/port/fore) +"abD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/external{ + req_one_access_txt = "13,8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) +"abE" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Medbay Cryogenics"; + network = list("ss13","medbay") + }, +/obj/structure/sign/poster/official/help_others{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"abF" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/closet/secure_closet/security/engine, +/obj/item/radio/intercom{ + pixel_y = -26 + }, +/obj/machinery/camera{ + c_tag = "Security Post - Cargo"; + dir = 1 + }, +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) "abG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -67,11 +1014,160 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) +"abH" = ( +/obj/structure/table, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/poster/official/medical_green_cross{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"abI" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) +"abJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/poster/official/walk{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"abK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/sign/poster/official/build{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"abL" = ( +/obj/structure/table, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/obj/structure/sign/poster/official/state_laws{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/science/robotics/lab) +"abM" = ( +/obj/structure/closet/secure_closet/security/med, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Security Post - Medbay"; + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/sign/poster/official/here_for_your_safety{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/medical) +"abN" = ( +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Escape Arm Southwest"; + dir = 1 + }, +/obj/structure/closet/crate/bin, +/obj/structure/sign/directions/security{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"abO" = ( +/obj/machinery/light, +/obj/structure/closet/crate/bin, +/obj/structure/sign/directions/command{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"abP" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/sign/poster/official/cohiba_robusto_ad{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "abQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/crew_quarters/theatre) +"abR" = ( +/obj/structure/chair/stool, +/obj/structure/sign/poster/official/foam_force_ad{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/fitness/recreation) +"abS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/obj/structure/sign/poster/official/no_erp{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/quartermaster/miningoffice) +"abT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/directions/evac{ + dir = 8; + icon_state = "direction_evac"; + pixel_x = 32; + pixel_y = 40 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + icon_state = "direction_eng"; + pixel_x = 32; + pixel_y = 24 + }, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_x = 32; + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "abU" = ( /obj/structure/cable{ icon_state = "4-8" @@ -81,6 +1177,25 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"abV" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/sign/poster/official/obey{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"abW" = ( +/obj/structure/tank_dispenser/oxygen, +/obj/machinery/camera/motion{ + c_tag = "Armory Motion Sensor North" + }, +/obj/structure/sign/poster/official/ion_rifle{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "abX" = ( /obj/machinery/airalarm{ pixel_y = 28 @@ -98,6 +1213,15 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"abY" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/structure/sign/poster/official/anniversary_vintage_reprint{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "abZ" = ( /obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -105,6 +1229,38 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"aca" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/camera{ + c_tag = "Brig Evidence Storage" + }, +/obj/structure/sign/poster/official/space_cops{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/security/main) +"acb" = ( +/obj/structure/sign/poster/official/science{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/white, +/area/science/mixing) +"acc" = ( +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) +"acd" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/structure/sign/poster/contraband/bountyhunters{ + pixel_x = 32 + }, +/turf/open/floor/plating, +/area/maintenance/central) "ace" = ( /obj/structure/cable{ icon_state = "4-8" @@ -114,6 +1270,19 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"acf" = ( +/obj/structure/chair/stool, +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_x = -32 + }, +/turf/open/floor/carpet, +/area/chapel/main) +"acg" = ( +/obj/structure/sign/poster/official/wtf_is_co2{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/science/storage) "acj" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -772,16 +1941,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"aon" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/chemistry) "aoo" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -915,9 +2074,6 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) -"arG" = ( -/turf/open/floor/plating, -/area/medical/medbay/central) "arH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2950,24 +4106,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/engine/engineering) -"aOl" = ( -/obj/structure/closet/secure_closet/security/med, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Security Post - Medbay"; - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/medical) "aOm" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -4937,13 +6075,6 @@ }, /turf/open/floor/carpet, /area/hallway/primary/central) -"bBB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bBH" = ( /obj/structure/cable{ icon_state = "0-4" @@ -6489,10 +7620,6 @@ /obj/machinery/holopad, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) -"bQf" = ( -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "bQg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7161,15 +8288,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/wood, /area/chapel/office) -"cbz" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/camera{ - c_tag = "Brig Evidence Storage" - }, -/turf/open/floor/plasteel/dark, -/area/security/main) "cbL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8466,15 +9584,6 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"cGQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "cGZ" = ( /obj/machinery/light{ dir = 8 @@ -8829,18 +9938,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"cSv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "cSC" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/white, @@ -9808,14 +10905,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"dvh" = ( -/obj/structure/table/reinforced, -/mob/living/carbon/monkey/punpun, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/bar) "dvs" = ( /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" @@ -10030,19 +11119,6 @@ /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/plasteel, /area/quartermaster/storage) -"dDf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "dDC" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -10878,15 +11954,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"eeh" = ( -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Escape Arm Southwest"; - dir = 1 - }, -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "eex" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/meter, @@ -11406,13 +12473,6 @@ dir = 8 }, /area/hallway/primary/fore) -"evr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/turf/open/floor/plasteel, -/area/quartermaster/miningoffice) "evI" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ dir = 1 @@ -11635,10 +12695,6 @@ }, /turf/open/floor/plating, /area/engine/storage) -"eEa" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/dorms) "eEy" = ( /obj/machinery/doorButtons/access_button{ idDoor = "virology_airlock_interior"; @@ -11673,15 +12729,6 @@ }, /turf/open/floor/plasteel/dark, /area/teleporter) -"eFy" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/computer/arcade/minesweeper{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar) "eFB" = ( /obj/structure/table/wood, /obj/item/reagent_containers/rag, @@ -12089,19 +13136,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"eOK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/hallway/primary/central) "eOO" = ( /obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel, @@ -12382,13 +13416,6 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"eZn" = ( -/obj/structure/tank_dispenser/oxygen, -/obj/machinery/camera/motion{ - c_tag = "Armory Motion Sensor North" - }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/security/armory) "eZA" = ( /obj/structure/cable{ icon_state = "0-4" @@ -12859,14 +13886,6 @@ }, /turf/open/floor/engine/co2, /area/engine/atmos) -"fnu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/quantumpad{ - map_pad_id = "1"; - map_pad_link_id = "2" - }, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) "fnx" = ( /obj/machinery/light{ dir = 1 @@ -12950,24 +13969,6 @@ }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) -"fpW" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #2" - }, -/obj/machinery/camera{ - c_tag = "Cargo Garage"; - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/maintenance/starboard) "fqj" = ( /obj/machinery/field/generator, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -13100,11 +14101,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/storage/eva) -"fuy" = ( -/obj/machinery/light, -/obj/structure/closet/crate/bin, -/turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) "fuB" = ( /obj/machinery/camera{ c_tag = "Auxiliary Bridge North"; @@ -13701,13 +14697,6 @@ }, /turf/open/floor/plating, /area/storage/atmos) -"fNd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering) "fNh" = ( /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -15083,18 +16072,6 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/engine/storage) -"gEz" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "gFb" = ( /obj/machinery/vending/wardrobe/law_wardrobe, /obj/item/radio/intercom{ @@ -15279,19 +16256,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/port) -"gKB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/radio/intercom{ - pixel_y = -26 - }, -/turf/open/floor/plasteel/white, -/area/science/misc_lab) "gKR" = ( /obj/machinery/mineral/equipment_vendor, /obj/structure/disposalpipe/segment{ @@ -15591,13 +16555,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"gRS" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar) "gSh" = ( /obj/structure/cable{ icon_state = "1-8" @@ -16192,31 +17149,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"hnB" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/mob/living/simple_animal/pet/cat/Runtime, -/obj/machinery/camera{ - c_tag = "Chief Medical Office"; - dir = 8; - network = list("ss13","medbay"); - pixel_y = -22 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) "hnO" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/plasteel/white, @@ -16878,12 +17810,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"hGM" = ( -/obj/structure/urinal{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/dorms) "hGU" = ( /obj/structure/closet/secure_closet/personal/cabinet{ pixel_x = -8 @@ -17878,14 +18804,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/wood, /area/chapel/office) -"ifQ" = ( -/mob/living/simple_animal/mouse/brown/Tom, -/obj/structure/chair/comfy/brown{ - color = "#596479"; - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/security/prison) "ifT" = ( /obj/structure/cable{ icon_state = "0-4" @@ -19716,19 +20634,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"jiV" = ( -/obj/structure/table, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "jiY" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -20467,10 +21372,6 @@ "jJu" = ( /turf/closed/wall/r_wall, /area/medical/medbay/zone3) -"jKb" = ( -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/storage/primary) "jKF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -22196,19 +23097,6 @@ }, /turf/open/floor/engine, /area/engine/atmospherics_engine) -"kPj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "kPn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, @@ -24383,24 +25271,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"mkm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/power/apc{ - areastring = "/area/hallway/primary/fore"; - dir = 1; - name = "Fore Primary Hallway APC"; - pixel_y = 24 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "mkr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24801,13 +25671,6 @@ /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"mzB" = ( -/obj/structure/table, -/obj/item/mmi, -/obj/item/mmi, -/obj/item/mmi, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) "mAk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -25364,22 +26227,6 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/dorms) -"mQo" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Hydroponics North" - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel/dark, -/area/hydroponics) "mQC" = ( /obj/machinery/airalarm{ dir = 1; @@ -26126,12 +26973,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/medical/genetics) -"nmY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "nnj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26164,14 +27005,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"noB" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/sloth/paperwork, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) "noQ" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -26790,34 +27623,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"nGa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - beacon_freq = 1400; - home_destination = "QM #1"; - suffix = "#1" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #1" - }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/starboard"; - dir = 4; - name = "Starboard Maintenance APC"; - pixel_x = 26 - }, -/turf/open/floor/pod/dark, -/area/maintenance/starboard) "nGd" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/toxins, @@ -27755,9 +28560,6 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/engine/atmospherics_engine) -"oiX" = ( -/turf/closed/wall, -/area/crew_quarters/heads/hop) "oje" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28737,23 +29539,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) -"oLT" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, -/area/hallway/secondary/exit/departure_lounge) "oME" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29574,13 +30359,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"pkh" = ( -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/kitchen) "pkJ" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -30305,20 +31083,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) -"pCj" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/mirror{ - pixel_x = -28 - }, -/obj/structure/urinal{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/dorms) "pCo" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 9 @@ -30911,12 +31675,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"pUz" = ( -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) "pUP" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel" @@ -31085,15 +31843,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"qbh" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "qbr" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -31879,13 +32628,6 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"qAq" = ( -/obj/machinery/quantumpad{ - map_pad_id = "5"; - map_pad_link_id = "6" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "qAx" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -33779,35 +34521,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"rFQ" = ( -/obj/structure/table/reinforced, -/mob/living/simple_animal/parrot/Poly, -/obj/item/clothing/glasses/meson{ - pixel_y = 4 - }, -/obj/item/cartridge/atmos, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/obj/machinery/keycard_auth{ - pixel_y = -28 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/heads/chief) "rGc" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -34300,10 +35013,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"rYN" = ( -/obj/structure/chair/stool, -/turf/open/floor/carpet, -/area/chapel/main) "rYQ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -34521,16 +35230,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"seR" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "seZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -34787,15 +35486,6 @@ /obj/machinery/computer/card, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"soN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "spa" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -35304,16 +35994,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine, /area/engine/engineering) -"sIn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/external{ - req_one_access_txt = "13,8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/port/fore) "sIT" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/pod/dark, @@ -37162,18 +37842,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) -"tJL" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "tKa" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; @@ -37432,24 +38100,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"tQd" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/closet/secure_closet/security/engine, -/obj/item/radio/intercom{ - pixel_y = -26 - }, -/obj/machinery/camera{ - c_tag = "Security Post - Cargo"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/supply) "tQv" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -37696,11 +38346,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) -"tWx" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "tXn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38014,23 +38659,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/crew_quarters/dorms) -"ugr" = ( -/obj/machinery/button/door{ - id = "Bath1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 24; - pixel_y = -5; - specialfunctions = 4 - }, -/obj/machinery/shower{ - pixel_y = 20 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/dorms) "uha" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39815,16 +40443,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) -"vlz" = ( -/obj/structure/urinal{ - pixel_y = 32 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 30 - }, -/turf/open/floor/plasteel/freezer, -/area/crew_quarters/dorms) "vlC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -42977,24 +43595,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) -"xdr" = ( -/obj/machinery/camera{ - c_tag = "Head of Security's Office"; - dir = 8 - }, -/obj/structure/bed/dogbed{ - desc = "A comfy-looking pet bed. You can even strap your pet in, in case the gravity turns off."; - name = "pet bed" - }, -/mob/living/simple_animal/hostile/retaliate/bat/secbat{ - desc = "An adorable fruit bat with a cute little hat, may or may not have a reputation for biting out eyeballs, or at least that's what the HoS'd tell you."; - name = "Colonel Chomps" - }, -/obj/item/storage/secure/safe/HoS{ - pixel_x = 35 - }, -/turf/open/floor/carpet, -/area/crew_quarters/heads/hos) "xdD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -43121,9 +43721,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"xhH" = ( -/turf/closed/wall/r_wall, -/area/hallway/primary/central) "xhV" = ( /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced{ @@ -43203,20 +43800,6 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"xlg" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Medbay Cryogenics"; - network = list("ss13","medbay") - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "xlm" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/plasteel, @@ -43320,11 +43903,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) -"xou" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/computer/shuttle/snow_taxi, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) "xow" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/security/glass{ @@ -43498,18 +44076,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible, /turf/open/floor/plating, /area/maintenance/department/electrical) -"xve" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "xvj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -43683,10 +44249,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"xCr" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/medical/medbay/central) "xCC" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -44313,10 +44875,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"xXX" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/maintenance/central) "xYD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/carpet, @@ -44371,10 +44929,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"yae" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "ybp" = ( /obj/structure/chair{ dir = 8 @@ -58953,8 +59507,8 @@ ash ash nQr ash -ash -ash +tmO +tmO wje ahC nOK @@ -59210,9 +59764,9 @@ rbW aoR apO ash -arG -ash -qbh +abq +tmO +abu auY hEf eGO @@ -59467,8 +60021,8 @@ rRV aoT pWz ash -xCr -ash +abr +abt lxF rbo ioG @@ -59721,11 +60275,11 @@ tUi ash tVS anm -jiV -ash -ash +abH ash ash +tmO +tmO dXR hOA irg @@ -59985,7 +60539,7 @@ arI syN atr rbo -jwo +aaF azq azq azq @@ -60224,7 +60778,7 @@ ash cxX sXJ sXJ -hnB +aal qhU vCE gIm @@ -61284,7 +61838,7 @@ aPB oqL aLG aNk -aOl +abM aPA avT avT @@ -62538,7 +63092,7 @@ vvH vvH fsA gZX -xlg +abE jUu xGP anm @@ -63321,7 +63875,7 @@ mAx ndm rQN aoX -soN +aaB ojv oTu oTu @@ -64604,7 +65158,7 @@ aoX ali yds yds -aon +abI aoX rJw tkr @@ -64839,10 +65393,10 @@ avT avT xUL rTG -sIn +abC kxU sdH -sIn +abD kxU pyw nYZ @@ -65120,7 +65674,7 @@ yds yds qWL aoX -gsM +abJ tkr iPX rQJ @@ -65645,7 +66199,7 @@ ayA sNK xmo rqW -mzB +abL rQJ szG aHG @@ -66392,7 +66946,7 @@ xUL xUL xUL tmO -fYx +aaA oDm tmO rhX @@ -66662,7 +67216,7 @@ nrJ iAR rik xWq -aAL +abK gxi wEP wJH @@ -67691,7 +68245,7 @@ xWq xWq xWq tmO -wje +aaC wje tmO ydp @@ -68205,7 +68759,7 @@ xUL xUL xUL tmO -wje +aaD iPX tmO tmO @@ -68463,7 +69017,7 @@ xUL xUL usE buO -wje +aaE cpC tmO ydp @@ -71331,7 +71885,7 @@ avT kfv kfv ilb -ifQ +aam rlG wSb wav @@ -72113,7 +72667,7 @@ wDk pmK dbB nxv -eZn +abW xBv nQM lZi @@ -74686,7 +75240,7 @@ oJF piv nre bWR -xdr +aan uKb fKC rVN @@ -75206,7 +75760,7 @@ cBD bQj gCG sdN -xXX +acd ubL diH uPJ @@ -75456,7 +76010,7 @@ bDr alG fmt cBD -cbz +aca jae bNS pST @@ -75721,7 +76275,7 @@ giT bZF xkT bVR -rYN +acf qOb bSd bXO @@ -77236,7 +77790,7 @@ xZg xZg xZg uBa -eeh +abN grV cTD cTD @@ -77246,7 +77800,7 @@ cTD grV lbp knn -eOK +aaW bBz lbp cBD @@ -77466,7 +78020,7 @@ gky ptY cgH ktw -xZL +aaG lzB avT avT @@ -77501,30 +78055,30 @@ vPQ vPQ vPQ bwu +aaR +aaT +aaX +aaY +abb lhQ -yae -kPj -bBB -lhQ -lhQ -vPQ -cGQ -vPQ -vPQ +abV +abf +abb +abb bNn vPQ qQt vPQ bJF bVX -cGQ +abj hhz vPQ vPQ vPQ haj pjn -tNf +abl sAw vPQ mdG @@ -78237,7 +78791,7 @@ cPI kxP vAs ktw -xZL +aaI lzB avT avT @@ -78252,7 +78806,7 @@ wxT bUP fLK rmN -oLT +aaK ljL uBa uBa @@ -78273,19 +78827,19 @@ fXU ffm jBl fmw -tWx +abT pBU reS +abc lhQ -lhQ -ceA -vun -ceA -ceA -ceA -seR -ceA -ceA +abd +abg +abd +abd +abd +abi +abd +abd bmP bQs vun @@ -78297,7 +78851,7 @@ ceA vun lhQ lhQ -ceA +abm bPc ceA bUL @@ -78521,7 +79075,7 @@ piX hJw kop uBa -fuy +abO bwx bwx bwx @@ -79035,7 +79589,7 @@ fWE wbE wbE uBa -rcH +abP bwx iSo bpM @@ -80581,8 +81135,8 @@ tHU bBL guv bpO -bDR -gfF +aaL +abR bDR jOl bBL @@ -80820,13 +81374,13 @@ iaO dnm hHC dnm -unA +aaJ unA unA unA unA dnm -unA +aaJ dnm unA unA @@ -80843,7 +81397,7 @@ bsx bLT bLT bLT -xhH +aaV rle cSG bCQ @@ -81098,7 +81652,7 @@ vAs vAs vAs bLT -fnu +aaN bxR mPM ohK @@ -81118,7 +81672,7 @@ bQC gsK wuB pyI -bXW +acg eqZ wpN vOV @@ -81276,7 +81830,7 @@ dvs mtP naE mtP -mtP +aaU nOY mtP naE @@ -81355,7 +81909,7 @@ vAs vAs vAs bLT -xou +aaQ jkL fcJ cqd @@ -81528,7 +82082,7 @@ ydp avT avT iHM -iHM +pgp pgp pgp pgp @@ -81783,11 +82337,11 @@ xUL ydp ydp ydp -avT bmX avT pgp -pCj +aab +dZV dZV gLk pgp @@ -81873,7 +82427,7 @@ bEi bEi lbp bAs -nmY +aaZ bCL bDW gpp @@ -82042,9 +82596,9 @@ ydp ydp ydp avT -avT pgp -hGM +aac +gLk gLk gLk pgp @@ -82298,10 +82852,10 @@ ydp ydp ydp ydp -ydp avT pgp -vlz +aab +aad gLk fBs pgp @@ -82392,11 +82946,11 @@ aGl bEa pHl aaw -gKB +abh qJV fjU fjU -fjU +acb qJV fuG qJV @@ -82556,7 +83110,7 @@ ydp ydp ydp avT -avT +pgp pgp pgp pgp @@ -82815,7 +83369,7 @@ ydp avT ydp pgp -ugr +aae pBh gLk pgp @@ -83074,7 +83628,7 @@ ydp pgp pgp pgp -eEa +aaf pgp pgp pgp @@ -83347,8 +83901,8 @@ skZ mSt geO cQv -nGa -fpW +aaj +aak oyf dzS dSQ @@ -83595,7 +84149,7 @@ mWy pgp uEG dKn -gEz +abA pax sdq iux @@ -83679,13 +84233,13 @@ dFp wTK tDY oXn -cSg +abY tRe egg cbQ iXG bWf -bVa +acc bVa bWf ftV @@ -84180,7 +84734,7 @@ bvq oCZ lxV dGP -evr +abS lxV hJE cmC @@ -84624,7 +85178,7 @@ iML kFr vuO vaj -rTv +aau mSt dWt fyr @@ -85375,7 +85929,7 @@ xUL xUL xUL kVO -bQf +aao qgm qgm qgm @@ -85392,7 +85946,7 @@ xJB hyK vVN qeL -oiX +abn trU knI oIb @@ -85634,7 +86188,7 @@ xUL qaO gct sGE -tJL +aaq ixf ixf giv @@ -86167,7 +86721,7 @@ iqZ seG tYT qKA -cSv +aav pJS pJS tQG @@ -86417,7 +86971,7 @@ mKv sAh sAh sAh -urI +aar uEz uEz hrS @@ -86660,7 +87214,7 @@ xUL xUL xUL kVO -qAq +aap acq fJc lfy @@ -87181,7 +87735,7 @@ wAx wuQ vnM wAx -mQo +abv mbE qss sYv @@ -87458,7 +88012,7 @@ mhq bNF wIA hTO -noB +aai wIA kti nrg @@ -88464,7 +89018,7 @@ hAw skK vKa gdg -pkh +aaa loM vKa nsv @@ -88485,7 +89039,7 @@ pJS leq qxT wIA -iCO +abp pJS pJS pJS @@ -88989,12 +89543,12 @@ fTy jvb xZp dVr -gRS +abx msK cKk dNB rmV -dDf +abB gaf pMD shN @@ -89247,7 +89801,7 @@ stW iKV hFj oNv -guV +abz cKk meG mcU @@ -90280,7 +90834,7 @@ jHT rkd mcU rNS -vyf +aax vyf hLQ nsf @@ -90297,7 +90851,7 @@ gwY pdD hMM qKP -tQd +abF jIt avT avT @@ -90543,7 +91097,7 @@ vkk qSi vkk vkk -pUz +aay pqj mcU pqj @@ -91036,7 +91590,7 @@ pCU ixf kcn llu -xve +abw gJP eGi mIe @@ -91314,7 +91868,7 @@ uqy yes iqH iqH -iqH +aaz iqH yes iqH @@ -92070,10 +92624,10 @@ gcY xop fbq lFv -dvh +aag gkl eOt -eFy +aby rYc hbb rkd @@ -92333,7 +92887,7 @@ cKk cKk cKk cKk -mkm +aat lpl xcA srk @@ -93877,7 +94431,7 @@ fPd eYu xOj jKF -jKb +abo wdR sda pAC @@ -94902,7 +95456,7 @@ wTe sPt iBL bnU -fNd +aas bDg fKE bnU @@ -96955,7 +97509,7 @@ ulr jJb xfH puE -rFQ +aah iiY piR tty diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a9d9bda00c..964c4e911e 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -65,9 +65,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isslimeperson(A) (is_species(A, /datum/species/jelly/slime)) #define isluminescent(A) (is_species(A, /datum/species/jelly/luminescent)) #define iszombie(A) (is_species(A, /datum/species/zombie)) -#define ismoth(A) (is_species(A, /datum/species/insect)) #define ishumanbasic(A) (is_species(A, /datum/species/human)) -#define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid) ) +#define iscatperson(A) (ishumanbasic(A) && istype(A.dna.species, /datum/species/human/felinid)) #define isdwarf(A) (is_species(A, /datum/species/dwarf)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) #define isangel(A) (is_species(A, /datum/species/angel)) @@ -80,8 +79,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isipcperson(A) (is_species(A, /datum/species/ipc)) #define issynthliz(A) (is_species(A, /datum/species/synthliz)) #define ismammal(A) (is_species(A, /datum/species/mammal)) -#define isavian(A) (is_species(A, /datum/species/avian)) -#define isaquatic(A) (is_species(A, /datum/species/aquatic)) #define isinsect(A) (is_species(A, /datum/species/insect)) #define isxenoperson(A) (is_species(A, /datum/species/xeno)) #define isstartjelly(A) (is_species(A, /datum/species/jelly/roundstartslime)) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 95e02c5a94..87126ae28f 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms) if("Medical Doctor") heirloom_type = /obj/item/healthanalyzer/advanced if("Paramedic") - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + heirloom_type = /obj/item/lighter if("Station Engineer") heirloom_type = /obj/item/wirecutters/brass if("Atmospheric Technician") diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index f6b0c8e24b..7b7fdbeaf9 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -94,6 +94,11 @@ targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's difficulty = 5 +/datum/objective_item/steal/blackbox + name = "the black box from the onboard blackbox recording device. Take care to wear the proper safety equipment when extracting the black box as the telecommunications array is likely to be under inhospitable conditions." + targetitem = /obj/item/blackbox //steal the forbidden ssblackbox + difficulty = 10 + /datum/objective_item/steal/nuke_core name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core!" targetitem = /obj/item/nuke_core diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 6c3289aa60..6ac6938f14 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -5,16 +5,73 @@ require the message server. */ -// A decorational representation of SSblackbox, usually placed alongside the message server. +// A decorational representation of SSblackbox, usually placed alongside the message server. Also contains a traitor theft item. /obj/machinery/blackbox_recorder icon = 'icons/obj/stationobjs.dmi' icon_state = "blackbox" - name = "Blackbox Recorder" + name = "blackbox recorder" density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70) + var/obj/item/stored + +/obj/machinery/blackbox_recorder/Initialize() + . = ..() + stored = new /obj/item/blackbox(src) + +/obj/machinery/blackbox_recorder/attack_hand(mob/living/user) + . = ..() + if(stored) + to_chat(user, "You start struggling to pry the [stored] from the [src]...") + if(!do_after(user, 30 SECONDS, TRUE, src)) + to_chat(user, "Your fingers slip as you fail to pry the [stored] from the [src], clicking it right back into the slot!") + return + if(user.put_in_hands(stored)) + stored.forceMove(user.drop_location()) + stored = null + to_chat(user, "You successfully pry the [stored] from the [src], and send its overwhelming weight tumbling onto the ground! The tapes on the [src] stop spinning...") + update_icon() + return + else + to_chat(user, "It seems that the blackbox is missing...") + return + +/obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params) + . = ..() + if(istype(I, /obj/item/blackbox)) + if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src)) + to_chat(user, "[I] is stuck to your hand!") + return + user.visible_message("[user] clicks the [I] into the [src]!", \ + "You press [I] into [src], and it clicks into place. The tapes on the [src] begin spinning again...") + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + stored = I + update_icon() + return ..() + return ..() + +/obj/machinery/blackbox_recorder/Destroy() + if(stored) + stored.forceMove(loc) + new /obj/effect/decal/cleanable/oil(loc) + return ..() + +/obj/machinery/blackbox_recorder/update_icon() + . = ..() + if(!stored) + icon_state = "blackbox_b" + else + icon_state = "blackbox" + +/obj/item/blackbox + name = "the blackbox" + desc = "A strange relic, capable of recording data on extradimensional vertices. It lives inside the blackbox recorder for safe keeping." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "blackcube" + w_class = WEIGHT_CLASS_BULKY + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // The message server itself. /obj/machinery/telecomms/message_server @@ -141,9 +198,9 @@ ..() if(href_list["photo"]) var/mob/M = usr - - M << browse_rsc(picture.picture_image, "pda_photo.png") - + + M << browse_rsc(picture.picture_image, "pda_photo.png") + var/dat = "
" diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 2d9d0b61c2..b1f51f608d 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -110,7 +110,7 @@ . += "The safety is [safety ? "on" : "off"]." if(reagents.total_volume) - . += "You can loose its screws to empty it." + . += "Alt-click to empty it." /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user) if(istype(target, tanktype) && target.Adjacent(user)) @@ -230,7 +230,7 @@ repetition++ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds) -/obj/item/extinguisher/screwdriver_act(mob/user, obj/item/tool) +/obj/item/extinguisher/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return EmptyExtinguisher(user) @@ -244,7 +244,7 @@ var/turf/open/theturf = T theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) - user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] by loosing the release valve's screws.") + user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] by using its release valve.") //firebot assembly /obj/item/extinguisher/attackby(obj/O, mob/user, params) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 5c88951654..a80eeacaf6 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -233,7 +233,7 @@ return T.PlaceOnTop(R.result_type, flags = CHANGETURF_INHERIT_AIR) else - O = new R.result_type(usr.drop_location()) + O = new R.result_type(get_turf(usr)) if(O) O.setDir(usr.dir) log_craft("[O] crafted by [usr] at [loc_name(O.loc)]") diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 52e8e9193f..83ac727c9e 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -446,10 +446,11 @@ /obj/item/storage/belt/durathread name = "durathread toolbelt" - desc = "A toolbelt made out of durathread, it seems resistant enough to hold even big tools like an RCD, it also has higher capacity." + desc = "A toolbelt made out of durathread, it seems robust enough to hold bigger tools like RCDs or RPDs, with enough pouches to hold more gear than a normal belt." icon_state = "webbing-durathread" item_state = "webbing-durathread" resistance_flags = FIRE_PROOF + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //If normal belts get this, the upgraded version should too /obj/item/storage/belt/durathread/ComponentInitialize() . = ..() @@ -469,7 +470,7 @@ /obj/item/t_scanner, /obj/item/analyzer, /obj/item/geiger_counter, - /obj/item/extinguisher/mini, + /obj/item/extinguisher, /obj/item/radio, /obj/item/clothing/gloves, /obj/item/holosign_creator, @@ -490,7 +491,8 @@ desc = "A belt for holding grenades." icon_state = "grenadebeltnew" item_state = "security" - + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE + /obj/item/storage/belt/grenade/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 249faae33d..0f01dfd5d9 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -361,6 +361,7 @@ /obj/item/seeds/reishi, /obj/item/seeds/banana, /obj/item/seeds/eggplant/eggy, + /obj/item/seeds/poppy/lily/trumpet, /obj/item/seeds/random, /obj/item/seeds/random) crate_name = "exotic seeds crate" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index d5a3c3abee..d540336b86 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -58,6 +58,10 @@ var/limb_integrity = 0 // How many zones (body parts, not precise) we have disabled so far, for naming purposes var/zones_disabled + ///These are armor values that protect the wearer, taken from the clothing's armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). + var/list/armor_list = list() + ///These are armor values that protect the clothing, taken from its armor datum. List updates on examine because it's currently only used to print armor ratings to chat in Topic(). + var/list/durability_list = list() /obj/item/clothing/Initialize() . = ..() @@ -85,7 +89,7 @@ tastes = list("dust" = 1, "lint" = 1) /obj/item/clothing/attack(mob/M, mob/user, def_zone) - if(user.a_intent != INTENT_HARM && ismoth(M)) + if(user.a_intent != INTENT_HARM && isinsect(M)) var/obj/item/reagent_containers/food/snacks/clothing/clothing_as_food = new clothing_as_food.name = name if(clothing_as_food.attack(M, user, def_zone)) @@ -253,6 +257,87 @@ how_cool_are_your_threads += "Adding or removing items from [src] makes no noise.\n" how_cool_are_your_threads += "" . += how_cool_are_your_threads.Join() + + if(LAZYLEN(armor_list)) + armor_list.Cut() + if(armor.bio) + armor_list += list("TOXIN" = armor.bio) + if(armor.bomb) + armor_list += list("EXPLOSIVE" = armor.bomb) + if(armor.bullet) + armor_list += list("BULLET" = armor.bullet) + if(armor.energy) + armor_list += list("ENERGY" = armor.energy) + if(armor.laser) + armor_list += list("LASER" = armor.laser) + if(armor.magic) + armor_list += list("MAGIC" = armor.magic) + if(armor.melee) + armor_list += list("MELEE" = armor.melee) + if(armor.rad) + armor_list += list("RADIATION" = armor.rad) + + if(LAZYLEN(durability_list)) + durability_list.Cut() + if(armor.fire) + durability_list += list("FIRE" = armor.fire) + if(armor.acid) + durability_list += list("ACID" = armor.acid) + + if(LAZYLEN(armor_list) || LAZYLEN(durability_list)) + . += "It has a tag listing its protection classes." + +/obj/item/clothing/Topic(href, href_list) + . = ..() + + if(href_list["list_armor"]) + var/list/readout = list("PROTECTION CLASSES (I-X)") + if(LAZYLEN(armor_list)) + readout += "\nARMOR" + for(var/dam_type in armor_list) + var/armor_amount = armor_list[dam_type] + readout += "\n[dam_type] [armor_to_protection_class(armor_amount)]" //e.g. BOMB IV + if(LAZYLEN(durability_list)) + readout += "\nDURABILITY" + for(var/dam_type in durability_list) + var/durability_amount = durability_list[dam_type] + readout += "\n[dam_type] [armor_to_protection_class(durability_amount)]" //e.g. FIRE II + readout += "" + + to_chat(usr, "[readout.Join()]") + +/** + * Rounds armor_value to nearest 10, divides it by 10 and then expresses it in roman numerals up to 10 + * + * Rounds armor_value to nearest 10, divides it by 10 + * and then expresses it in roman numerals up to 10 + * Arguments: + * * armor_value - Number we're converting + */ +/obj/item/clothing/proc/armor_to_protection_class(armor_value) + armor_value = round(armor_value,10) / 10 + switch (armor_value) + if (1) + . = "I" + if (2) + . = "II" + if (3) + . = "III" + if (4) + . = "IV" + if (5) + . = "V" + if (6) + . = "VI" + if (7) + . = "VII" + if (8) + . = "VIII" + if (9) + . = "IX" + if (10 to INFINITY) + . = "X" + return . /obj/item/clothing/obj_break(damage_flag) damaged_clothes = CLOTHING_DAMAGED diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 8d8049194b..c1a17b87a4 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -920,75 +920,75 @@ /datum/chemical_reaction/coldscales name = "Cold Scales" - id = /datum/reagent/consumable/ethanol/coldscales - results = list(/datum/reagent/consumable/ethanol/coldscales = 3) + id = /datum/reagent/consumable/ethanol/species_drink/coldscales + results = list(/datum/reagent/consumable/ethanol/species_drink/coldscales = 3) required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/toxin/slimejelly = 1, /datum/reagent/consumable/menthol = 1) /datum/chemical_reaction/oil_drum name = "Oil Drum" - id = /datum/reagent/consumable/ethanol/oil_drum - results = list(/datum/reagent/consumable/ethanol/oil_drum = 3) + id = /datum/reagent/consumable/ethanol/species_drink/oil_drum + results = list(/datum/reagent/consumable/ethanol/species_drink/oil_drum = 3) required_reagents = list(/datum/reagent/consumable/ethanol = 1, /datum/reagent/oil = 1, /datum/reagent/consumable/ethanol/champagne = 12) /datum/chemical_reaction/nord_king name = "Nord King" - id = /datum/reagent/consumable/ethanol/nord_king - results = list(/datum/reagent/consumable/ethanol/nord_king = 10) + id = /datum/reagent/consumable/ethanol/species_drink/nord_king + results = list(/datum/reagent/consumable/ethanol/species_drink/nord_king = 10) required_reagents = list(/datum/reagent/consumable/ethanol = 5, /datum/reagent/consumable/honey = 1, /datum/reagent/consumable/ethanol/red_mead = 10) /datum/chemical_reaction/velvet_kiss name = "Velvet Kiss" - id = /datum/reagent/consumable/ethanol/velvet_kiss - results = list(/datum/reagent/consumable/ethanol/velvet_kiss = 15) //Limited races use this + id = /datum/reagent/consumable/ethanol/species_drink/velvet_kiss + results = list(/datum/reagent/consumable/ethanol/species_drink/velvet_kiss = 15) //Limited races use this required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/wine = 10) /datum/chemical_reaction/abduction_fruit name = "Abduction Fruit" - id = /datum/reagent/consumable/ethanol/abduction_fruit - results = list(/datum/reagent/consumable/ethanol/abduction_fruit = 3) + id = /datum/reagent/consumable/ethanol/species_drink/abduction_fruit + results = list(/datum/reagent/consumable/ethanol/species_drink/abduction_fruit = 3) required_reagents = list(/datum/reagent/consumable/limejuice = 10, /datum/reagent/consumable/strawberryjuice = 5, /datum/reagent/consumable/watermelonjuice = 10) /datum/chemical_reaction/bug_zapper name = "Bug Zapper" - id = /datum/reagent/consumable/ethanol/bug_zapper - results = list(/datum/reagent/consumable/ethanol/bug_zapper = 20) //Harder to make + id = /datum/reagent/consumable/ethanol/species_drink/bug_zapper + results = list(/datum/reagent/consumable/ethanol/species_drink/bug_zapper = 20) //Harder to make required_reagents = list(/datum/reagent/consumable/lemonjuice = 10, /datum/reagent/teslium = 1, /datum/reagent/copper = 10) /datum/chemical_reaction/mush_crush name = "Mush Crush" - id = /datum/reagent/consumable/ethanol/mush_crush - results = list(/datum/reagent/consumable/ethanol/mush_crush = 10) + id = /datum/reagent/consumable/ethanol/species_drink/mush_crush + results = list(/datum/reagent/consumable/ethanol/species_drink/mush_crush = 10) required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/ash = 5, /datum/reagent/toxin/coffeepowder = 10) /datum/chemical_reaction/darkbrew name = "Darkbrew" - id = /datum/reagent/consumable/ethanol/darkbrew - results = list(/datum/reagent/consumable/ethanol/darkbrew = 20)//Limited races use this + id = /datum/reagent/consumable/ethanol/species_drink/darkbrew + results = list(/datum/reagent/consumable/ethanol/species_drink/darkbrew = 20)//Limited races use this required_reagents = list(/datum/reagent/liquid_dark_matter = 5, /datum/reagent/toxin/bungotoxin = 5, /datum/reagent/toxin/coffeepowder = 10) /datum/chemical_reaction/hollow_bone name = "Hollow Bone" - id = /datum/reagent/consumable/ethanol/hollow_bone - results = list(/datum/reagent/consumable/ethanol/hollow_bone = 10) + id = /datum/reagent/consumable/ethanol/species_drink/hollow_bone + results = list(/datum/reagent/consumable/ethanol/species_drink/hollow_bone = 10) required_reagents = list(/datum/reagent/toxin/bonehurtingjuice = 5, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/coconutmilk = 10) /datum/chemical_reaction/frisky_kitty name = "Frisky Kitty" - id = /datum/reagent/consumable/ethanol/frisky_kitty - results = list(/datum/reagent/consumable/ethanol/frisky_kitty = 2) + id = /datum/reagent/consumable/ethanol/species_drink/frisky_kitty + results = list(/datum/reagent/consumable/ethanol/species_drink/frisky_kitty = 2) required_reagents = list(/datum/reagent/consumable/catnip_tea = 1, /datum/reagent/consumable/milk = 1) required_temp = 296 //Just above room temp (22.85'C) /datum/chemical_reaction/jell_wyrm name = "Jell Wyrm" - id = /datum/reagent/consumable/ethanol/jell_wyrm - results = list(/datum/reagent/consumable/ethanol/jell_wyrm = 2) + id = /datum/reagent/consumable/ethanol/species_drink/jell_wyrm + results = list(/datum/reagent/consumable/ethanol/species_drink/jell_wyrm = 2) required_reagents = list(/datum/reagent/toxin/slimejelly = 1, /datum/reagent/toxin/carpotoxin = 1, /datum/reagent/carbondioxide = 5) required_temp = 333 // (59.85'C) /datum/chemical_reaction/laval_spit name = "Laval Spit" - id = /datum/reagent/consumable/ethanol/laval_spit - results = list(/datum/reagent/consumable/ethanol/laval_spit = 20) //Limited use + id = /datum/reagent/consumable/ethanol/species_drink/laval_spit + results = list(/datum/reagent/consumable/ethanol/species_drink/laval_spit = 20) //Limited use required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/consumable/ethanol/mauna_loa = 10, /datum/reagent/sulfur = 5) required_temp = 900 // (626.85'C) diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 24eb5d7234..96517d5ea2 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -4,6 +4,10 @@ status_flags = GODMODE|CANPUSH mouse_drag_pointer = MOUSE_INACTIVE_POINTER var/in_use = FALSE + vore_flags = NO_VORE + +/mob/living/carbon/human/vore + vore_flags = DEVOURABLE | DIGESTABLE | FEEDING INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 3eb6d66677..e1f6d4544e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -105,6 +105,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/whitelisted = 0 //Is this species restricted to certain players? var/whitelist = list() //List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both. var/icon_limbs //Overrides the icon used for the limbs of this species. Mainly for downstream, and also because hardcoded icons disgust me. Implemented and maintained as a favor in return for a downstream's implementation of synths. + var/species_type + + var/tail_type //type of tail i.e. mam_tail + var/wagging_type //type of wagging i.e. waggingtail_lizard /// Our default override for typing indicator state var/typing_indicator_state @@ -1063,7 +1067,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.adjustBruteLoss(1) /datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) - return + if(H) + stop_wagging_tail(H) /datum/species/proc/auto_equip(mob/living/carbon/human/H) // handles the equipping of species-specific gear @@ -2227,12 +2232,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) /datum/species/proc/ExtinguishMob(mob/living/carbon/human/H) return - //////////// //Stun// //////////// /datum/species/proc/spec_stun(mob/living/carbon/human/H,amount) + if(H) + stop_wagging_tail(H) + . = stunmod * H.physiology.stun_mod * amount ////////////// @@ -2250,11 +2257,29 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) //////////////// /datum/species/proc/can_wag_tail(mob/living/carbon/human/H) - return FALSE + if(!tail_type || !wagging_type) + return FALSE + else + return mutant_bodyparts[tail_type] || mutant_bodyparts[wagging_type] /datum/species/proc/is_wagging_tail(mob/living/carbon/human/H) - return FALSE + return mutant_bodyparts["waggingtail_lizard"] /datum/species/proc/start_wagging_tail(mob/living/carbon/human/H) + if(tail_type && wagging_type) + if(mutant_bodyparts[tail_type]) + mutant_bodyparts[wagging_type] = mutant_bodyparts[tail_type] + mutant_bodyparts -= tail_type + if(mutant_bodyparts["spines"] || mutant_bodyparts["waggingspines"]) //special lizard thing + mutant_bodyparts["waggingspines"] = mutant_bodyparts["spines"] + mutant_bodyparts -= "spines" + H.update_body() /datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H) + if(tail_type && wagging_type) + mutant_bodyparts[tail_type] = mutant_bodyparts[wagging_type] + mutant_bodyparts -= wagging_type + if(mutant_bodyparts["spines"] || mutant_bodyparts["waggingspines"]) //special lizard thing + mutant_bodyparts["spines"] = mutant_bodyparts["waggingspines"] + mutant_bodyparts -= "waggingspines" + H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm index 409781efb2..1e77775efa 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -6,6 +6,7 @@ species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,CAN_SCAR) inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH) mutanttongue = /obj/item/organ/tongue/abductor + species_type = "alien" /datum/species/abductor/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 94f64ceacb..c5b57b82ab 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -11,6 +11,7 @@ mutanttongue = /obj/item/organ/tongue/robot species_language_holder = /datum/language_holder/synthetic limbs_id = "synth" + species_type = "robotic" /datum/species/android/on_species_gain(mob/living/carbon/C) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm index 2d43c9964e..d6860e1249 100644 --- a/code/modules/mob/living/carbon/human/species_types/angel.dm +++ b/code/modules/mob/living/carbon/human/species_types/angel.dm @@ -9,6 +9,7 @@ blacklisted = 1 limbs_id = "human" skinned_type = /obj/item/stack/sheet/animalhide/human + species_type = "human" //they're a kind of human var/datum/action/innate/flight/fly diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm index 53f5a86953..3c913909ad 100644 --- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm @@ -18,32 +18,6 @@ exotic_blood_color = BLOOD_COLOR_BUG languagewhitelist = list("Moffic", "Buggy") //Skyrat change - species language whitelist -/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/insect/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/insect/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/insect/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/insect/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/insect/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() - -/datum/species/insect/qualifies_for_rank(rank, list/features) - return TRUE + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" + species_type = "insect" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/corporate.dm b/code/modules/mob/living/carbon/human/species_types/corporate.dm index e062e1cbf7..a2597ed286 100644 --- a/code/modules/mob/living/carbon/human/species_types/corporate.dm +++ b/code/modules/mob/living/carbon/human/species_types/corporate.dm @@ -17,4 +17,5 @@ species_traits = list(NOBLOOD,EYECOLOR,NOGENITALS) inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER) sexes = 0 - gib_types = /obj/effect/gibspawner/robot \ No newline at end of file + gib_types = /obj/effect/gibspawner/robot + species_type = "robotic" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 4e5aa57b0a..dcd81c90b9 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -14,6 +14,7 @@ limbs_id = "human" skinned_type = /obj/item/stack/sheet/animalhide/human has_field_of_vision = FALSE //Too much of a trouble, their vision is already bound to their severed head. + species_type = "undead" var/pumpkin = FALSE var/obj/item/dullahan_relay/myhead diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index 009dba7707..8eb0e0181c 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // mutant_organs = list(/obj/item/organ/dwarfgland) //Dwarven alcohol gland, literal gland warrior mutantliver = /obj/item/organ/liver/dwarf //Dwarven super liver (Otherwise they r doomed) species_language_holder = /datum/language_holder/dwarf + species_type = "human" //a kind of human /mob/living/carbon/human/species/dwarf //species admin spawn path race = /datum/species/dwarf //and the race the path is set to. diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 2f0595e2c0..b760fd0aee 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -9,37 +9,9 @@ mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat -/datum/species/human/felinid/qualifies_for_rank(rank, list/features) - return TRUE - -//Curiosity killed the cat's wagging tail. -/datum/species/human/felinid/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/human/felinid/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - - -/datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/human/felinid/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/human/felinid/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/human/felinid/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" + species_type = "furry" /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) if(ishuman(C)) diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index c3ec8b42ea..b99c3e2bc2 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -12,6 +12,7 @@ liked_food = GROSS exotic_bloodtype = "BUG" exotic_blood_color = BLOOD_COLOR_BUG + species_type = "insect" /datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) if(istype(chem, /datum/reagent/toxin/pestkiller)) diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 6970086637..18359f415f 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -14,68 +14,6 @@ liked_food = MEAT | FRIED disliked_food = TOXIC -//Curiosity killed the cat's wagging tail. -/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/mammal/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/mammal/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/mammal/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/mammal/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/mammal/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() - - -/datum/species/mammal/qualifies_for_rank(rank, list/features) - return TRUE - - -//Alien// -/datum/species/xeno - // A cloning mistake, crossing human and xenomorph DNA - name = "Xenomorph Hybrid" - id = "xeno" - say_mod = "hisses" - default_color = "00FF00" - icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR) - mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") - attack_verb = "slash" - attack_sound = 'sound/weapons/slash.ogg' - miss_sound = 'sound/weapons/slashmiss.ogg' - meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno - gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless) - skinned_type = /obj/item/stack/sheet/animalhide/xeno - exotic_bloodtype = "X*" - damage_overlay_type = "xeno" - liked_food = MEAT - languagewhitelist = list("Xenomorph") - -//Praise the Omnissiah, A challange worthy of my skills - HS - -//EXOTIC// -//These races will likely include lots of downsides and upsides. Keep them relatively balanced.// - -//misc -/mob/living/carbon/human/dummy - vore_flags = NO_VORE - -/mob/living/carbon/human/vore - vore_flags = DEVOURABLE | DIGESTABLE | FEEDING + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" + species_type = "furry" diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 7100caf178..438eaf1eea 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -32,6 +32,8 @@ var/special_name_chance = 5 var/owner //dobby is a free golem + species_type = "golem" + /datum/species/golem/random_name(gender,unique,lastname) var/golem_surname = pick(GLOB.golem_names) // 3% chance that our golem has a human surname, because diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index b164fb1ba0..e93a5106c9 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -10,8 +10,9 @@ disliked_food = GROSS | RAW liked_food = JUNKFOOD | FRIED -/datum/species/human/qualifies_for_rank(rank, list/features) - return TRUE //Pure humans are always allowed in all roles. + tail_type = "tail_human" + wagging_type = "waggingtail_human" + species_type = "human" /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(H) @@ -21,21 +22,3 @@ if(H) stop_wagging_tail(H) . = ..() - -/datum/species/human/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["tail_human"] || mutant_bodyparts["waggingtail_human"] - -/datum/species/human/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["waggingtail_human"] - -/datum/species/human/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["tail_human"]) - mutant_bodyparts["waggingtail_human"] = mutant_bodyparts["tail_human"] - mutant_bodyparts -= "tail_human" - H.update_body() - -/datum/species/human/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["waggingtail_human"]) - mutant_bodyparts["tail_human"] = mutant_bodyparts["waggingtail_human"] - mutant_bodyparts -= "waggingtail_human" - H.update_body() diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm index 09a4322fde..34336a5b0c 100644 --- a/code/modules/mob/living/carbon/human/species_types/ipc.dm +++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm @@ -21,6 +21,7 @@ exotic_bloodtype = "HF" exotic_blood_color = BLOOD_COLOR_OIL + species_type = "robotic" var/datum/action/innate/monitor_change/screen languagewhitelist = list("Encoded Audio Language") //Skyrat change - species language whitelist diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 576f97c030..8427302568 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -26,6 +26,10 @@ species_language_holder = /datum/language_holder/jelly mutant_brain = /obj/item/organ/brain/jelly + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" + species_type = "jelly" + /obj/item/organ/brain/jelly name = "slime nucleus" desc = "A slimey membranous mass from a slime person" @@ -129,33 +133,6 @@ return to_chat(H, "...but there is not enough of you to go around! You must attain more mass to heal!") -/datum/species/jelly/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/jelly/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/jelly/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/jelly/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/jelly/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/jelly/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() - ////////////////////////////////////////////////////////SLIMEPEOPLE/////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 90987512b7..5f74d1ba55 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -28,6 +28,10 @@ languagewhitelist = list("Draconic") //Skyrat change - species language whitelist species_language_holder = /datum/language_holder/lizard + tail_type = "tail_lizard" + wagging_type = "waggingtail_lizard" + species_type = "lizard" + /datum/species/lizard/random_name(gender,unique,lastname) if(unique) return random_unique_lizard_name(gender) @@ -39,41 +43,6 @@ return randname -/datum/species/lizard/qualifies_for_rank(rank, list/features) - return TRUE - -//I wag in death -/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/lizard/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/lizard/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["tail_lizard"] || mutant_bodyparts["waggingtail_lizard"] - -/datum/species/lizard/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["waggingtail_lizard"] - -/datum/species/lizard/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["tail_lizard"]) - mutant_bodyparts["waggingtail_lizard"] = mutant_bodyparts["tail_lizard"] - mutant_bodyparts["waggingspines"] = mutant_bodyparts["spines"] - mutant_bodyparts -= "tail_lizard" - mutant_bodyparts -= "spines" - H.update_body() - -/datum/species/lizard/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["waggingtail_lizard"]) - mutant_bodyparts["tail_lizard"] = mutant_bodyparts["waggingtail_lizard"] - mutant_bodyparts["spines"] = mutant_bodyparts["waggingspines"] - mutant_bodyparts -= "waggingtail_lizard" - mutant_bodyparts -= "waggingspines" - H.update_body() - /* Lizard subspecies: ASHWALKERS */ diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 59781da736..438a62b4cd 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -21,6 +21,8 @@ burnmod = 1.25 heatmod = 1.5 + species_type = "plant" + mutanteyes = /obj/item/organ/eyes/night_vision/mushroom var/datum/martial_art/mushpunch/mush languagewhitelist = list("Mushroom") //Skyrat change - species language whitelist diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index f0db4f599a..0ef63e9de0 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -23,6 +23,8 @@ outfit_important_for_life = /datum/outfit/plasmaman languagewhitelist = list("Calcic") //Skyrat change - species language whitelist + species_type = "skeleton" + /datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() var/atmos_sealed = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 952a374f2c..79152ad525 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -20,6 +20,8 @@ var/light_bruteheal = -1 languagewhitelist = list("Sylvan") //Skyrat change - species language whitelist + species_type = "plant" + /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() C.faction |= "plants" @@ -72,29 +74,5 @@ light_burnheal = -0.2 light_toxheal = -0.7 -/datum/species/pod/pseudo_weak/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/pod/pseudo_weak/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/pod/pseudo_weak/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/pod/pseudo_weak/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/pod/pseudo_weak/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/pod/pseudo_weak/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index d7ad3943bd..9e6ed7fa93 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -16,6 +16,8 @@ mutanteyes = /obj/item/organ/eyes/night_vision languagewhitelist = list("Shadowtongue") //Skyrat change - species language whitelist + species_type = "shadow" + /datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() C.AddElement(/datum/element/photosynthesis, 1, 1, 0, 0, 0, 0, SHADOW_SPECIES_LIGHT_THRESHOLD, SHADOW_SPECIES_LIGHT_THRESHOLD) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index 78efddf70d..54d56fea06 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -15,6 +15,8 @@ brutemod = 1.25 burnmod = 1.25 + species_type = "skeleton" //they have their own category that's disassociated from undead, paired with plasmapeople + /datum/species/skeleton/New() if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) //skeletons are stronger during the spooky season! inherent_traits |= list(TRAIT_RESISTHEAT,TRAIT_RESISTCOLD) diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm index 4dd59a08ab..057d884ff8 100644 --- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm +++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm @@ -21,33 +21,6 @@ exotic_bloodtype = "S" exotic_blood_color = BLOOD_COLOR_OIL -/datum/species/synthliz/qualifies_for_rank(rank, list/features) - return TRUE - -//I wag in death -/datum/species/synthliz/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/synthliz/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - -/datum/species/synthliz/can_wag_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] - -/datum/species/synthliz/is_wagging_tail(mob/living/carbon/human/H) - return mutant_bodyparts["mam_waggingtail"] - -/datum/species/synthliz/start_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_tail"]) - mutant_bodyparts["mam_waggingtail"] = mutant_bodyparts["mam_tail"] - mutant_bodyparts -= "mam_tail" - H.update_body() - -/datum/species/synthliz/stop_wagging_tail(mob/living/carbon/human/H) - if(mutant_bodyparts["mam_waggingtail"]) - mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] - mutant_bodyparts -= "mam_waggingtail" - H.update_body() + tail_type = "mam_tail" + wagging_type = "mam_waggingtail" + species_type = "robotic" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 85f1fbf386..a1a2a33c54 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -17,6 +17,7 @@ var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged species_language_holder = /datum/language_holder/synthetic + species_type = "robotic" /datum/species/synth/military name = "Military Synth" @@ -43,7 +44,6 @@ return TRUE return ..() - /datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H) if(S && !istype(S, type)) name = S.name diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 9c9220132c..d8fc06b716 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -14,6 +14,7 @@ limbs_id = "human" skinned_type = /obj/item/stack/sheet/animalhide/human var/info_text = "You are a Vampire. You will slowly but constantly lose blood if outside of a coffin. If inside a coffin, you will slowly heal. You may gain more blood by grabbing a live victim and using your drain ability." + species_type = "undead" /datum/species/vampire/check_roundstart_eligible() if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) diff --git a/code/modules/mob/living/carbon/human/species_types/xeno.dm b/code/modules/mob/living/carbon/human/species_types/xeno.dm new file mode 100644 index 0000000000..db34d1ae45 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/xeno.dm @@ -0,0 +1,19 @@ +/datum/species/xeno + // A cloning mistake, crossing human and xenomorph DNA + name = "Xenomorph Hybrid" + id = "xeno" + say_mod = "hisses" + default_color = "00FF00" + icon_limbs = DEFAULT_BODYPART_ICON_CITADEL + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR) + mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") + attack_verb = "slash" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno + gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless) + skinned_type = /obj/item/stack/sheet/animalhide/xeno + exotic_bloodtype = "X*" + damage_overlay_type = "xeno" + liked_food = MEAT + species_type = "alien" diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index ab0838c873..990e2c9db3 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -15,6 +15,7 @@ var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') disliked_food = NONE liked_food = GROSS | MEAT | RAW + species_type = "undead" /datum/species/zombie/notspaceproof id = "notspaceproofzombie" diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 2cc66c1e09..b0f7ab7e09 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -226,7 +226,7 @@ 'sound/voice/catpeople/nyahehe.ogg'), 50, 1) return - else if(ismoth(C)) + else if(isinsect(C)) playsound(C, 'sound/voice/moth/mothlaugh.ogg', 50, 1) else if(ishumanbasic(C)) if(user.gender == FEMALE) @@ -244,7 +244,7 @@ . = ..() if(. && iscarbon(user)) //Citadel Edit because this is hilarious var/mob/living/carbon/C = user - if(ismoth(C)) + if(isinsect(C)) playsound(C, 'sound/voice/moth/mothchitter.ogg', 50, 1) /datum/emote/living/look diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 385a82baa5..4034759c72 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1962,12 +1962,12 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M) //Bugs should not drink Bug spray. - if(ismoth(M) || isflyperson(M)) + if(isinsect(M) || isflyperson(M)) M.adjustToxLoss(1,0) return ..() /datum/reagent/consumable/ethanol/bug_spray/on_mob_add(mob/living/carbon/M) - if(ismoth(M) || isflyperson(M)) + if(isinsect(M) || isflyperson(M)) M.emote("scream") return ..() @@ -2270,25 +2270,29 @@ All effects don't start immediately, but rather get worse over time; the rate is //////////////////// //Race-Base-Drinks// //////////////////// +/datum/reagent/consumable/ethanol/species_drink + var/species_required + var/disgust = 25 + boozepwr = 50 -/datum/reagent/consumable/ethanol/coldscales +/datum/reagent/consumable/ethanol/species_drink/on_mob_life(mob/living/carbon/C) + if(C.dna.species && C.dna.species.species_type == species_required) //species have a species_type variable that refers to one of the drinks + quality = RACE_DRINK + else + C.adjust_disgust(disgust) + +/datum/reagent/consumable/ethanol/species_drink/coldscales name = "Coldscales" color = "#5AEB52" //(90, 235, 82) description = "A cold looking drink made for people with scales." - boozepwr = 50 //strong! taste_description = "dead flies" glass_icon_state = "coldscales" glass_name = "glass of Coldscales" glass_desc = "A soft green drink that looks inviting!" -/datum/reagent/consumable/ethanol/coldscales/on_mob_life(mob/living/carbon/M) - if(islizard(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "lizard" -/datum/reagent/consumable/ethanol/oil_drum +/datum/reagent/consumable/ethanol/species_drink/oil_drum name = "Oil Drum" color = "#000000" //(0, 0, 0) description = "Industrial grade oil mixed with some ethanol to make it a drink. Somehow not known to be toxic." @@ -2298,31 +2302,20 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "Drum of oil" glass_desc = "A gray can of booze and oil..." -/datum/reagent/consumable/ethanol/oil_drum/on_mob_life(mob/living/carbon/M) - if(isipcperson(M) || issynthliz(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "robot" -/datum/reagent/consumable/ethanol/nord_king +/datum/reagent/consumable/ethanol/species_drink/nord_king name = "Nord King" color = "#EB1010" //(235, 16, 16) description = "Strong mead mixed with more honey and ethanol. Beloved by its human patrons." - boozepwr = 50 //strong! taste_description = "honey and red wine" glass_icon_state = "nord_king" glass_name = "Keg of Nord King" glass_desc = "A dripping keg of red mead." -/datum/reagent/consumable/ethanol/nord_king/on_mob_life(mob/living/carbon/M) - if(ishumanbasic(M) || isdwarf(M) || isangel(M)) //Humans and angel races are rare - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "basic" -/datum/reagent/consumable/ethanol/velvet_kiss +/datum/reagent/consumable/ethanol/species_drink/velvet_kiss name = "Velvet Kiss" color = "#EB1010" //(235, 16, 16) description = "A bloody drink mixed with wine." @@ -2332,14 +2325,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Velvet Kiss" glass_desc = "Red and white drink for the upper classes or undead." -/datum/reagent/consumable/ethanol/velvet_kiss/on_mob_life(mob/living/carbon/M) - if(iszombie(M) || isvampire(M) || isdullahan(M)) //Rare races! - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "undead" -/datum/reagent/consumable/ethanol/abduction_fruit +/datum/reagent/consumable/ethanol/species_drink/abduction_fruit name = "Abduction Fruit" color = "#DEFACD" //(222, 250, 205) description = "Mixing of juices to make an alien taste." @@ -2349,14 +2337,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Abduction Fruit" glass_desc = "Mixed fruits that were never meant to be mixed..." -/datum/reagent/consumable/ethanol/abduction_fruit/on_mob_life(mob/living/carbon/M) - if(isabductor(M) || isxenoperson(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "alien" -/datum/reagent/consumable/ethanol/bug_zapper +/datum/reagent/consumable/ethanol/species_drink/bug_zapper name = "Bug Zapper" color = "#F5882A" //(222, 250, 205) description = "Copper and lemon juice. Hardly even a drink." @@ -2366,14 +2349,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Bug Zapper" glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption." -/datum/reagent/consumable/ethanol/bug_zapper/on_mob_life(mob/living/carbon/M) - if(isinsect(M) || isflyperson(M) || ismoth(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "bug" -/datum/reagent/consumable/ethanol/mush_crush +/datum/reagent/consumable/ethanol/species_drink/mush_crush name = "Mush Crush" color = "#F5882A" //(222, 250, 205) description = "Soil in a glass." @@ -2383,14 +2361,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Mush Crush" glass_desc = "Popular among people that want to grow their own food rather than drink the soil." -/datum/reagent/consumable/ethanol/mush_crush/on_mob_life(mob/living/carbon/M) - if(ispodperson(M) || ismush(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "plant" -/datum/reagent/consumable/ethanol/darkbrew +/datum/reagent/consumable/ethanol/species_drink/darkbrew name = "Darkbrew" color = "#000000" //(0, 0, 0) description = "Contained dark matter mixed with coffee." @@ -2400,31 +2373,21 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Darkbrew" glass_desc = "A pitch black drink that's commonly confused with a type of coffee." -/datum/reagent/consumable/ethanol/darkbrew/on_mob_life(mob/living/carbon/M) - if(isshadow(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "shadow" -/datum/reagent/consumable/ethanol/hollow_bone +/datum/reagent/consumable/ethanol/species_drink/hollow_bone name = "Hollow Bone" color = "#FCF7D4" //(252, 247, 212) - description = "Shockingly none-harmful mix of toxins and milk." + description = "Shockingly non-harmful mix of toxins and milk." boozepwr = 15 taste_description = "Milk and salt" glass_icon_state = "hollow_bone" glass_name = "skull of Hollow Bone" - glass_desc = "Mixing of milk and bone hurting juice for enjoyment for rather skinny people." + glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people." -/datum/reagent/consumable/ethanol/hollow_bone/on_mob_life(mob/living/carbon/M) - if(isplasmaman(M) || isskeleton(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "skeleton" -/datum/reagent/consumable/ethanol/frisky_kitty +/datum/reagent/consumable/ethanol/species_drink/frisky_kitty name = "Frisky Kitty" color = "#FCF7D4" //(252, 247, 212) description = "Warm milk mixed with a catnip." @@ -2434,14 +2397,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "cup of Drisky Kitty" glass_desc = "Warm milk and some catnip." -/datum/reagent/consumable/ethanol/frisky_kitty/on_mob_life(mob/living/carbon/M) - if(ismammal(M) || iscatperson(M)) //well its not to bad for mammals - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "furry" -/datum/reagent/consumable/ethanol/jell_wyrm +/datum/reagent/consumable/ethanol/species_drink/jell_wyrm name = "Jell Wyrm" color = "#FF6200" //(255, 98, 0) description = "Horrible mix of Co2, toxins and heat. Meant for slime based life." @@ -2451,15 +2409,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Jell Wyrm" glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for." -/datum/reagent/consumable/ethanol/jell_wyrm/on_mob_life(mob/living/carbon/M) - if(isjellyperson(M) || isstartjelly(M) || isslimeperson(M) || isluminescent(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - M.adjustToxLoss(1, 0) //Low tox due to being carp + jell toxins. - return ..() + species_required = "jelly" -/datum/reagent/consumable/ethanol/laval_spit //Yes Laval +/datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval name = "Laval Spit" color = "#DE3009" //(222, 48, 9) description = "Heat minerals and some mauna loa. Meant for rock based life." @@ -2469,15 +2421,10 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of Laval Spit" glass_desc = "Piping hot drink for those who can stomach the heat of lava." -/datum/reagent/consumable/ethanol/laval_spit/on_mob_life(mob/living/carbon/M) - if(isgolem(M)) - quality = RACE_DRINK - else - M.adjust_disgust(25) - return ..() + species_required = "golem" /////////////// -//Barrle Wine// +//Barrel Wine// /////////////// /datum/reagent/consumable/ethanol/fruit_wine diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm index ccaa998cf7..5149259bb8 100644 --- a/code/modules/uplink/uplink_items/uplink_devices.dm +++ b/code/modules/uplink/uplink_items/uplink_devices.dm @@ -206,10 +206,10 @@ /datum/uplink_item/device_tools/stimpack name = "Stimpack" - desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about \ + desc = "Stimpacks, the tool of many great heroes. Makes you nearly immune to non-lethal weaponry for about \ 5 minutes after injection." item = /obj/item/reagent_containers/syringe/stimulants - cost = 3 + cost = 5 surplus = 90 /datum/uplink_item/device_tools/medkit diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 3d045ba31e..2681f781a9 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -93,7 +93,8 @@ playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1) owner.do_jitter_animation(living_transformation_time) owner.Stun(living_transformation_time) - to_chat(owner, "You are now a zombie!") + to_chat(owner, "You are now a zombie! You claw and bite, turning your fellow crewmembers into friends that help spread the plague.") + to_chat(owner, "You are a zombie. Please act like one. Letting the crew remove the tumor inside your brain is a dick move to whoever infected you. Please do not do it.") /obj/item/organ/zombie_infection/nodamage causes_damage = FALSE diff --git a/html/changelogs/AutoChangeLog-pr-12817.yml b/html/changelogs/AutoChangeLog-pr-12817.yml new file mode 100644 index 0000000000..e20c0521cc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12817.yml @@ -0,0 +1,4 @@ +author: "kappa-sama" +delete-after: True +changes: + - balance: "Stimpaks cost 5tc once more, up from 3tc." diff --git a/html/changelogs/AutoChangeLog-pr-12876.yml b/html/changelogs/AutoChangeLog-pr-12876.yml new file mode 100644 index 0000000000..722ec99ddb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12876.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - tweak: "species code is now slightly less messy" diff --git a/html/changelogs/AutoChangeLog-pr-12884.yml b/html/changelogs/AutoChangeLog-pr-12884.yml new file mode 100644 index 0000000000..1e75adeb31 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12884.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "slight tweak to how material crafting works" diff --git a/html/changelogs/AutoChangeLog-pr-12901.yml b/html/changelogs/AutoChangeLog-pr-12901.yml new file mode 100644 index 0000000000..49f4185a3e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12901.yml @@ -0,0 +1,4 @@ +author: "CameronWoof" +delete-after: True +changes: + - tweak: "Exotic seed crates now contain a spaceman's trumpet seed packet." diff --git a/html/changelogs/AutoChangeLog-pr-12916.yml b/html/changelogs/AutoChangeLog-pr-12916.yml new file mode 100644 index 0000000000..3f062d62e9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12916.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - tweak: "Decluttered toxins and hid the yellow mix line in atmos, for metastation" diff --git a/html/changelogs/AutoChangeLog-pr-12918.yml b/html/changelogs/AutoChangeLog-pr-12918.yml new file mode 100644 index 0000000000..658f6e125a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12918.yml @@ -0,0 +1,4 @@ +author: "SiliconMain" +delete-after: True +changes: + - tweak: "Paramedic heirloom is now a zippo" diff --git a/html/changelogs/AutoChangeLog-pr-12919.yml b/html/changelogs/AutoChangeLog-pr-12919.yml new file mode 100644 index 0000000000..481ad571cf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12919.yml @@ -0,0 +1,4 @@ +author: "SiliconMain" +delete-after: True +changes: + - tweak: "Durathread belts now protect their contents from radiation, and can hold full sized extinguishers" diff --git a/html/changelogs/AutoChangeLog-pr-12920.yml b/html/changelogs/AutoChangeLog-pr-12920.yml new file mode 100644 index 0000000000..9125a56f01 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12920.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - rscadd: "Black Box theft objective" diff --git a/html/changelogs/AutoChangeLog-pr-12921.yml b/html/changelogs/AutoChangeLog-pr-12921.yml new file mode 100644 index 0000000000..56b9dd0e94 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12921.yml @@ -0,0 +1,4 @@ +author: "Cacogen" +delete-after: True +changes: + - rscadd: "OSHA has more pull than anyone could have expected. All armor provided by Nanotrasen and the syndicate now have tags that accurately lists defenses and resistances of a piece of clothing." diff --git a/html/changelogs/AutoChangeLog-pr-12923.yml b/html/changelogs/AutoChangeLog-pr-12923.yml new file mode 100644 index 0000000000..56d6d6c687 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12923.yml @@ -0,0 +1,9 @@ +author: "EmeraldSundisk" +delete-after: True +changes: + - rscadd: "Renovates Snow Taxi's northeast bathroom to have multiple non-urinal toilets and showers" + - rscadd: "Adds signage/labeling to improve map readability" + - rscadd: "Adds a bathroom to the northwest station" + - rscadd: "Adds a filing cabinet to the cargo department" + - tweak: "Area designation adjustments to account for the above changes" + - bugfix: "Adds a missing airlock cyclelink near medical" diff --git a/html/changelogs/AutoChangeLog-pr-12927.yml b/html/changelogs/AutoChangeLog-pr-12927.yml new file mode 100644 index 0000000000..63162e0656 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12927.yml @@ -0,0 +1,4 @@ +author: "Ludox235" +delete-after: True +changes: + - tweak: "Makes the flavour text that appears when you become a zombie tell you to act like one." diff --git a/html/changelogs/AutoChangeLog-pr-12934.yml b/html/changelogs/AutoChangeLog-pr-12934.yml new file mode 100644 index 0000000000..ca6a3a01b9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12934.yml @@ -0,0 +1,5 @@ +author: "dapnee" +delete-after: True +changes: + - tweak: "added a fan to the listening outpost" + - bugfix: "added two missing r-walls near the SM, removed random light and wire node below the engine, and fixed the missing cable in the courtroom on Kilo" diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index c361563da3..ecc6e2dd2c 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 67c1a59c51..16efcf262e 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 3984aab1e2..cfcbbf797d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2491,6 +2491,7 @@ #include "code\modules\mob\living\carbon\human\species_types\synthliz.dm" #include "code\modules\mob\living\carbon\human\species_types\synths.dm" #include "code\modules\mob\living\carbon\human\species_types\vampire.dm" +#include "code\modules\mob\living\carbon\human\species_types\xeno.dm" #include "code\modules\mob\living\carbon\human\species_types\zombies.dm" #include "code\modules\mob\living\carbon\monkey\combat.dm" #include "code\modules\mob\living\carbon\monkey\death.dm"