diff --git a/GainStation13/code/game/objects/items/docility_implant.dm b/GainStation13/code/game/objects/items/docility_implant.dm index c50506ec6b..ebc957c22b 100644 --- a/GainStation13/code/game/objects/items/docility_implant.dm +++ b/GainStation13/code/game/objects/items/docility_implant.dm @@ -35,6 +35,8 @@ for(var/trait in traits_list) ADD_TRAIT(target, trait, src) + to_chat(target_human, "You suddenly feel a lot more docile and peaceful, your body turning lethargic and your mind hazy.") + target_human.nutri_mult += 1 return TRUE @@ -50,10 +52,11 @@ for(var/trait in traits_list) REMOVE_TRAIT(target_human, trait, src) + to_chat(target_human, "Your mind sharpens and you feel more lively again, the soothing thoughts of peacefully lazing around going away.") + target_human.nutri_mult -= 1 return TRUE - /obj/item/implant/docile/livestock name = "livestock implant" traits_list = list( @@ -67,6 +70,9 @@ TRAIT_NO_MISC, TRAIT_NORUNNING, TRAIT_MILKY, + TRAIT_VORACIOUS, + TRAIT_CHUNKYFINGERS, + TRAIT_HEAT, ) /// What is the name of the mob before we change it? var/stored_name = "" @@ -78,18 +84,6 @@ /obj/item/implant/docile/livestock/justfat //gs13 - for admin fuckery name = "hacked livestock implant" required_fatness = 0 - traits_list = list( - TRAIT_WEIGHT_LOSS_IMMUNE, - TRAIT_PACIFISM, - TRAIT_CLUMSY, - TRAIT_FAT_GOOD, - TRAIT_HEAVY_SLEEPER, - TRAIT_DOCILE, - TRAIT_LIVESTOCK, - TRAIT_NO_MISC, - TRAIT_NORUNNING, - TRAIT_MILKY, - ) /obj/item/implant/docile/livestock/can_be_implanted_in(mob/living/target) @@ -111,6 +105,8 @@ target_human.real_name = new_name target_human.name = new_name + to_chat(target, "As your mind slows down, you experience a strange desire to be good, obedient and fat cattle...") + if(target_human?.getorganslot("testicles")) var/obj/item/organ/genital/testicles/balls = target_human?.getorganslot("testicles") balls.fluid_mult = balls.fluid_mult * productivity_mult @@ -130,6 +126,9 @@ target_human.real_name = stored_name target_human.name = stored_name + to_chat(source, "Your mind sharpens and you feel more lively again, the soothing thoughts of peacefully lazing around going away.") + + if(target_human?.getorganslot("testicles")) var/obj/item/organ/genital/testicles/balls = target_human?.getorganslot("testicles") balls.fluid_mult = balls.fluid_mult / productivity_mult diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ffb42c99e8..d89896efe7 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -1163,26 +1163,24 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abQ" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 4; - name = "Port Emergency Storage"; - req_access_txt = "0"; - req_one_access_txt = "0" +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals10" }, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "abR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - dir = 4; - name = "Genetics Maintenance"; - req_access_txt = "0"; - req_one_access_txt = "12;45;5;9" +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "paramedic_shutters"; + name = "paramedic shutters" }, /turf/open/floor/plating, -/area/maintenance/department/engine) +/area/medical/paramedic) "abS" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -6437,6 +6435,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, /turf/open/floor/plasteel/white, /area/security/brig) "amP" = ( @@ -7739,8 +7739,16 @@ /turf/open/space, /area/space/nearstation) "apq" = ( -/turf/closed/wall, -/area/commons/storage/emergency/port) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "apr" = ( /obj/machinery/gateway/centerstation, /turf/open/floor/plasteel/dark, @@ -9624,8 +9632,7 @@ /obj/machinery/door/airlock/command{ dir = 4; id_tag = "CMOCell"; - name = "Personal Examination Room"; - req_access_txt = "40" + name = "Personal Examination Room" }, /obj/structure/cable{ icon_state = "4-8" @@ -10221,8 +10228,16 @@ /area/command/gateway) "auj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/commons/storage/emergency/port) +/obj/machinery/suit_storage_unit/paramedic, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "auk" = ( /obj/machinery/door/airlock{ name = "Laundry Room" @@ -14903,12 +14918,30 @@ pixel_y = 32 }, /obj/effect/landmark/xeno_spawn, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aEg" = ( /obj/structure/urinal{ pixel_y = 32 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aEh" = ( @@ -14919,6 +14952,15 @@ dir = 8; pixel_x = 23 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aEi" = ( @@ -15356,6 +15398,15 @@ /obj/structure/mirror{ pixel_x = -28 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aFa" = ( @@ -15685,6 +15736,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aFN" = ( @@ -16120,6 +16176,11 @@ /obj/structure/sign/poster/official/no_erp{ pixel_x = -32 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aGJ" = ( @@ -16130,6 +16191,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aGK" = ( @@ -16457,12 +16523,20 @@ /obj/machinery/door/airlock{ name = "Unit 1" }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aHq" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aHr" = ( @@ -16470,6 +16544,11 @@ dir = 4 }, /obj/item/soap/nanotrasen, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aHs" = ( @@ -16930,6 +17009,11 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aIm" = ( @@ -17009,15 +17093,9 @@ /turf/open/floor/plasteel/dark, /area/security/checkpoint/medical) "aIt" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/paramedic) "aIu" = ( /obj/machinery/light{ dir = 8 @@ -17063,13 +17141,6 @@ /turf/open/floor/plasteel/dark, /area/security/checkpoint/medical) "aIy" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/reagent_containers/food/drinks/britcup{ - desc = "Kingston's personal cup." - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -17080,6 +17151,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/structure/chair/comfy{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "aIz" = ( @@ -27426,6 +27500,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bfb" = ( @@ -28886,6 +28963,7 @@ pixel_x = -27; pixel_y = -1 }, +/obj/structure/closet/emcloset, /turf/open/floor/plasteel, /area/hallway/primary/central) "bhK" = ( @@ -29036,12 +29114,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/structure/chair{ - dir = 4 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/hallway/primary/central) "big" = ( @@ -29333,42 +29410,22 @@ /turf/open/floor/plasteel/grimy, /area/commons/lounge) "biO" = ( -/obj/structure/table/glass, -/obj/item/healthanalyzer{ - layer = 3.1 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/pen{ - layer = 3.2 +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"biP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"biP" = ( -/obj/item/kirbyplants{ - icon_state = "plant-05" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/sign/departments/examroom{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "biQ" = ( @@ -29382,30 +29439,27 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "biR" = ( -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Central Primary Hallway Genetics"; - dir = 1 - }, +/obj/vehicle/ridden/wheelchair, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/vending/mealdor, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "biS" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "biT" = ( -/obj/structure/closet/firecloset, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -29435,14 +29489,12 @@ /area/commons/fitness/recreation) "biW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/maintenance{ - name = "Port Emergency Storage"; - req_access_txt = "0"; - req_one_access_txt = "0" +/obj/machinery/door/airlock/medical{ + req_access_txt = "5;6;12;64"; + name = "Paramedic Office" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/turf/open/floor/plasteel, +/area/medical/paramedic) "biY" = ( /turf/closed/wall, /area/medical/morgue) @@ -29511,18 +29563,14 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bjj" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Med Breakroom" }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -29741,10 +29789,17 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "bjR" = ( -/obj/structure/plasticflaps/opaque, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/structure/closet/secure_closet/paramedic, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "bjS" = ( /obj/machinery/airalarm/unlocked{ pixel_y = 23 @@ -30249,65 +30304,101 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "bkW" = ( -/obj/item/hemostat, -/obj/item/retractor, -/obj/item/cautery, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/turf/open/floor/plating, -/area/maintenance/department/engine) -"bkX" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) +"bkX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bkY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bkZ" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Genetics Cloning Foyer"; - dir = 2; - network = list("ss13","medbay") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/power/apc{ - dir = 1; - name = "Port Emergency Storage APC"; - pixel_y = 24 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, /obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 + icon_state = "1-2" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bla" = ( -/obj/machinery/airalarm{ - pixel_y = 22 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical{ + req_access_txt = "5;6;12;64"; + dir = 4; + name = "Paramedic Office" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/turf/open/floor/plasteel/white, +/area/medical/paramedic) "blc" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 2 +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -2; + pixel_y = 11 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/trash_pile, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "bld" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/dark, @@ -30873,11 +30964,33 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) "bmf" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/power/apc{ + dir = 1; + name = "Port Emergency Storage APC"; + pixel_y = 24 }, -/turf/open/floor/plating, -/area/maintenance/department/engine) +/obj/machinery/camera{ + c_tag = "Genetics Cloning Foyer"; + dir = 2; + network = list("ss13","medbay") + }, +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bmg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -30888,8 +31001,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bmi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -30903,8 +31024,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bmj" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -30916,14 +31045,24 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "bmk" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/storage/toolbox/emergency, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/machinery/door/poddoor/shutters/preopen{ + id = "paramedic_shutters"; + name = "paramedic shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/paramedic) "bml" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -30939,16 +31078,19 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "bmn" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_decals10" }, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "bmo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -31416,26 +31558,15 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) -"bnx" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/structure/table, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/clothing/neck/stethoscope, -/obj/item/clothing/mask/surgical, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, +/area/medical/paramedic) +"bnx" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "paramedic_shutters"; + name = "paramedic shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/medical/medbay/zone3) "bny" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -31443,18 +31574,7 @@ dir = 8; pixel_x = 28 }, -/obj/item/kirbyplants{ - icon_state = "plant-11" - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, +/turf/closed/wall, /area/medical/medbay/zone3) "bnz" = ( /obj/structure/table, @@ -31929,6 +32049,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "boz" = ( @@ -31946,16 +32070,19 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "boA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/table, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "boB" = ( @@ -31964,6 +32091,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/kirbyplants{ + icon_state = "plant-11" + }, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "boC" = ( @@ -32570,6 +32704,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "bpE" = ( @@ -40838,6 +40975,8 @@ /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, /turf/open/floor/plasteel/freezer, /area/medical/surgery) "bHc" = ( @@ -56346,6 +56485,16 @@ }, /turf/open/floor/plasteel/white, /area/science/explab) +"eYT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock{ + name = "Med Breakroom"; + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/department/engine) "eZA" = ( /obj/item/stack/cable_coil/cut/random, /turf/open/floor/plating, @@ -56776,6 +56925,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/service/chapel/office) +"fZX" = ( +/obj/vehicle/ridden/wheelchair, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "gaJ" = ( /obj/machinery/status_display/ai, /turf/closed/wall, @@ -57213,6 +57373,23 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"gIl" = ( +/obj/structure/chair/comfy{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/entry) "gIC" = ( /obj/structure/cable{ icon_state = "1-8" @@ -58170,6 +58347,25 @@ /obj/item/book/manual/blubbery_bartender, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"iFH" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/sign/departments/examroom{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "iFI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59403,6 +59599,18 @@ }, /turf/open/floor/engine, /area/engineering/main) +"lmO" = ( +/obj/machinery/door/window/southleft{ + name = "Paramedic Window"; + req_access_txt = "5" + }, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "paramedic_shutters"; + name = "paramedic shutters" + }, +/turf/open/floor/plating, +/area/medical/paramedic) "lnn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral, @@ -60556,9 +60764,25 @@ /turf/open/floor/plasteel/white, /area/science/explab) "nCR" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/effect/landmark/start/paramedic, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/obj/machinery/button/door{ + dir = 4; + id = "paramedic_shutters"; + name = "Privacy shutters"; + pixel_y = 28 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "nDo" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -60792,6 +61016,25 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) +"nYQ" = ( +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/item/book/manual/med_SOP, +/obj/item/ashtray{ + pixel_x = 16 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "nZh" = ( /obj/structure/cable{ icon_state = "1-8" @@ -61081,6 +61324,24 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/cargo) +"oxY" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/chair/stool{ + pixel_x = -11; + pixel_y = 13 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "oyE" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -61391,6 +61652,14 @@ /obj/effect/landmark/carpspawn, /turf/open/space/basic, /area/space/station_ruins) +"oUp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/airlock/medical{ + req_access_txt = "5;6;12;64"; + name = "Paramedic Office" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone3) "oVH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -61575,9 +61844,8 @@ /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit/departure_lounge) "prD" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/turf/closed/wall, +/area/medical/paramedic) "prQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -62114,6 +62382,22 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) +"qwz" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "qxq" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Air Out" @@ -62584,21 +62868,25 @@ /turf/open/floor/plating, /area/maintenance/department/science) "rvH" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - dir = 4; - freq = 1400; - location = "Medbay" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 4; - icon_state = "left"; - name = "Medbay Delivery"; - req_access_txt = "28" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/table, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/reagent_containers/food/drinks/britcup{ + desc = "Kingston's personal cup." }, /turf/open/floor/plasteel/dark, -/area/commons/storage/emergency/port) +/area/hallway/secondary/entry) "rwf" = ( /obj/machinery/power/emitter/anchored{ dir = 8; @@ -62901,6 +63189,21 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/department/science) +"scy" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "scz" = ( /obj/machinery/power/apc/highcap/fifteen_k{ dir = 8; @@ -62960,6 +63263,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/command/heads_quarters/captain) +"sjM" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/paramedic, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "skw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/closed/wall, @@ -63422,6 +63736,9 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"thG" = ( +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "thW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -63679,8 +63996,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "tTW" = ( -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "tXn" = ( /obj/structure/sink{ dir = 4; @@ -63759,6 +64079,17 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"uew" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/glass, +/obj/item/healthanalyzer{ + layer = 3.1 + }, +/obj/item/pen{ + layer = 3.2 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "ueO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -64049,6 +64380,22 @@ icon_state = "platingdmg3" }, /area/maintenance/department/chapel/monastery) +"uCs" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "uCu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, @@ -64116,6 +64463,13 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"uLT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "uMe" = ( /obj/structure/cable{ icon_state = "0-2"; @@ -64556,7 +64910,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "vJq" = ( -/obj/machinery/vending/gato, +/obj/machinery/vending/mealdor, /turf/open/floor/wood, /area/commons/lounge) "vJS" = ( @@ -64702,6 +65056,21 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"waJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light, +/obj/machinery/camera{ + c_tag = "Central Primary Hallway Genetics"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "waN" = ( /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -65166,8 +65535,11 @@ /area/maintenance/department/science) "wUf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/commons/storage/emergency/port) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/medical/paramedic) "wUk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65186,6 +65558,10 @@ icon_state = "panelscorched" }, /area/maintenance/department/security/brig) +"wVl" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/medical/paramedic) "wVC" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Sci"; @@ -65691,18 +66067,21 @@ /turf/open/floor/engine, /area/science/explab) "xQc" = ( -/obj/machinery/door/firedoor, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock{ - name = "Port Emergency Storage"; - req_access_txt = "0" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/plasteel/freezer, -/area/commons/storage/emergency/port) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/cafeteria{ + dir = 5 + }, +/area/medical/paramedic) "xSX" = ( /obj/machinery/airalarm/unlocked{ pixel_y = 23 @@ -87563,8 +87942,8 @@ aGT aGq aGT aHD +biO aGT -aIt aGT aJx aGT @@ -87821,9 +88200,9 @@ sQe sQe biJ sQe -aYG +rvH aIy -aJy +gIl aJy aKc aYG @@ -88863,7 +89242,7 @@ byd bzE bAN bnv -bDi +bTl bme bsn bva @@ -89107,7 +89486,7 @@ bie biN ooz ooz -ocR +eYT bnv bos bpw @@ -89361,10 +89740,10 @@ ooz bga ooz ooz -bga +ooz ooz bkW -bmf +bmh bnv bot bpx @@ -89614,14 +89993,14 @@ aAL aAL aAL bfg -aAL -aAL +uLT +uew bhJ bif -biO -apq -apq -abR +aAN +nYQ +oxY +bmh bnv bou bnv @@ -89874,12 +90253,12 @@ bfh aEa bgZ bhK -aIe -biP -apq +iFH +aAN +uCs bkX bmh -apq +prD bov bpy bqW @@ -90131,12 +90510,12 @@ aKI bge bha bhL -aHN +qwz bjj xQc bkY bmi -prD +aIt bow bpz bpz @@ -90388,9 +90767,9 @@ gRi bgf bhb aDZ -aHN -biR -apq +waJ +aAN +bmf bkZ bmj bnw @@ -90645,9 +91024,9 @@ bfi bgg bhc aAL -big -biS -apq +biT +aAN +abR bla bmk prD @@ -90902,12 +91281,12 @@ gRi bgh aJI aDZ -aHN -biT -apq +biP +aAN +scy abQ -apq -apq +fZX +prD boz bpB bqZ @@ -91160,11 +91539,11 @@ bgi aJI aDZ aHN -apq -apq -tTW -apq -apq +lmO +sjM +thG +biR +prD bnv bpC ass @@ -91417,7 +91796,7 @@ rrV aoM aDZ aHN -apq +prD nCR tTW apq @@ -91675,11 +92054,11 @@ aJI aDZ bih biW -wUf +biS wUf bmn +oUp iGJ -bjQ bpE brc bsy @@ -91931,7 +92310,7 @@ kXb bhd aBI bii -auj +wVl bjR blc auj @@ -92189,7 +92568,7 @@ aJI aDZ bij biY -rvH +biY biY biY biY