diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index f531886834d..9c86551014e 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -12590,7 +12590,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "fuT" = ( @@ -12627,7 +12626,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "fvz" = ( @@ -25737,10 +25735,6 @@ }, /turf/open/floor/iron/small, /area/station/engineering/atmos/pumproom) -"jMB" = ( -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) "jMC" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 @@ -26990,13 +26984,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kiF" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white/small, -/area/station/medical/virology) "kiG" = ( /obj/structure/broken_flooring/singular/directional/east, /obj/machinery/recharge_station, @@ -107024,7 +107011,7 @@ bUv cSk gLb nlS -kiF +eRX gpM sSQ hrF @@ -108562,7 +108549,7 @@ jrk gIF wYA bpS -jMB +hOp nYk vVP xAA diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 651a3452425..f9bbb5e2f86 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -14464,6 +14464,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/library/artgallery) +"dzq" = ( +/obj/structure/chair/office/light, +/obj/effect/turf_decal/trimline/green/filled/warning, +/turf/open/floor/iron/white, +/area/station/medical/virology) "dzw" = ( /turf/closed/wall/r_wall, /area/station/security/brig) @@ -14794,6 +14799,17 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/security/evidence) +"dFf" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/medical/virology) "dFg" = ( /turf/open/floor/iron/chapel{ dir = 9 @@ -20587,6 +20603,15 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"fdv" = ( +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/virology) "fdG" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -25299,14 +25324,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/kitchen) -"glo" = ( -/obj/structure/chair/office/light, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 10 - }, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white, -/area/station/medical/virology) "glv" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -30878,6 +30895,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"hHe" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/sign/warning/electric_shock/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "hHi" = ( /obj/structure/closet/crate/hydroponics, /obj/item/paper/guides/jobs/hydroponics, @@ -38681,13 +38705,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) -"jCw" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/sign/warning/electric_shock/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "jCI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39448,6 +39465,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/large, /area/station/security/checkpoint/escape) +"jMb" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "jMk" = ( /obj/machinery/door/window/left/directional/east{ name = "Danger: Conveyor Access"; @@ -39561,16 +39585,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"jNK" = ( -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, -/obj/item/toy/figure/virologist, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/virology) "jNM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -54985,12 +54999,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"nKV" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, -/obj/effect/turf_decal/trimline/green/filled/warning, -/turf/open/floor/iron/white, -/area/station/medical/virology) "nLt" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 @@ -60901,6 +60909,13 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"pmN" = ( +/obj/structure/chair/office/light, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "pmS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -76976,6 +76991,21 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) +"tlu" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = 5 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/item/toy/figure/bitrunner{ + pixel_x = -6 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/bitrunning/den) "tlA" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -77748,13 +77778,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"tuH" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/sign/warning/electric_shock/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "tuN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -87082,18 +87105,6 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) -"vKf" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/medical/virology) "vKl" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -88340,21 +88351,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/prison/garden) -"wcZ" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ - pixel_x = 5 - }, -/obj/machinery/camera/autoname/directional/south, -/obj/item/toy/figure/bitrunner{ - pixel_x = -6 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/cargo/bitrunning/den) "wda" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -131408,7 +131404,7 @@ tgT rZl wjV jpN -glo +pmN rJG gqm qYo @@ -131911,8 +131907,8 @@ bMV wjP aaa uUx -jNK -vKf +fdv +dFf qJA gKl ecC @@ -131922,7 +131918,7 @@ gqm jyT wjV sFR -nKV +dzq fLV gqm qYo @@ -141069,7 +141065,7 @@ qbd gHq lJw tYI -wcZ +tlu hXg lDY tpZ @@ -146276,10 +146272,10 @@ qMf lrr qTb wZE -jCw +hHe nEM uEv -tuH +jMb wZE pSr wlD diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 99bb35e9d16..014de5124e8 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -24507,7 +24507,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, -/obj/effect/landmark/start/virologist, /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/dark, /area/station/medical/virology) @@ -39316,7 +39315,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "mae" = ( @@ -52920,10 +52918,6 @@ /area/station/medical/surgery/fore) "qgA" = ( /obj/structure/table, -/obj/item/toy/figure/virologist{ - pixel_x = -8; - pixel_y = 7 - }, /obj/item/radio/headset/headset_med{ pixel_x = -3; pixel_y = -2 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5bc830ffdca..06db10e8d2c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -15733,7 +15733,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/effect/landmark/start/virologist, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, @@ -69628,7 +69627,6 @@ "wEw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/virologist, /obj/effect/turf_decal/stripes/line{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a59304995c8..3e24c506add 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5713,15 +5713,6 @@ "bYz" = ( /turf/open/floor/circuit, /area/station/maintenance/port/aft) -"bYN" = ( -/obj/effect/turf_decal/siding/wideplating_new{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "bZb" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -11457,6 +11448,16 @@ /obj/item/storage/backpack/duffelbag/sec, /turf/open/floor/iron/dark, /area/station/security/office) +"eiZ" = ( +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) "eje" = ( /obj/structure/chair{ dir = 4 @@ -11866,15 +11867,6 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) -"epl" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "epv" = ( /obj/structure/table, /obj/item/hand_labeler{ @@ -13866,6 +13858,17 @@ "fcq" = ( /turf/closed/wall, /area/station/maintenance/port/greater) +"fcw" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/mining{ + name = "Deliveries" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) "fcA" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -13892,6 +13895,22 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"fdi" = ( +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/east{ + c_tag = "Garden" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "fdl" = ( /obj/effect/decal/cleanable/food/flour, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -14892,15 +14911,6 @@ /obj/structure/sign/warning/pods, /turf/closed/wall, /area/station/commons/locker) -"ftQ" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) "fuc" = ( /obj/structure/frame/machine{ anchored = 1 @@ -15777,6 +15787,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"fMC" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/virology) "fMN" = ( /obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment{ @@ -15874,6 +15891,20 @@ /obj/machinery/gateway/centerstation, /turf/open/floor/iron/dark, /area/station/command/gateway) +"fPj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/siding/wideplating_new/corner, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "fPw" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/dark, @@ -17139,19 +17170,6 @@ /obj/structure/chair/wood/wings, /turf/open/floor/carpet, /area/station/service/theater) -"gpk" = ( -/obj/structure/table, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/crowbar, -/obj/item/reagent_containers/cup/watering_can, -/obj/item/cultivator, -/obj/item/hatchet, -/obj/item/plant_analyzer, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "gpv" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -17217,6 +17235,16 @@ }, /turf/open/floor/plating, /area/station/science/genetics) +"gqw" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/window/spawner/directional/south, +/mob/living/basic/chicken{ + name = "Kentucky"; + real_name = "Kentucky" + }, +/obj/structure/flora/grass/jungle/b/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "gqA" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/button/door/directional/south{ @@ -17931,14 +17959,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) -"gDJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/sorting) "gDT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -19803,6 +19823,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"hlG" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) "hlN" = ( /obj/structure/frame/machine{ anchored = 1 @@ -20037,15 +20063,6 @@ dir = 8 }, /area/station/service/chapel/office) -"hsm" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/cargo_technician, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/sorting) "hsp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20066,11 +20083,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/chapel) -"hsR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/sorting) "hsZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, @@ -20860,6 +20872,12 @@ /obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"hFj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "hFz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -23146,22 +23164,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"ivb" = ( -/obj/machinery/disposal/bin, -/obj/machinery/camera/directional/east{ - c_tag = "Garden" - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/wideplating_new, -/obj/structure/railing, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "ivc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24038,6 +24040,11 @@ }, /turf/open/space, /area/space/nearstation) +"iLj" = ( +/obj/structure/window/spawner/directional/west, +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "iLk" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -25148,6 +25155,17 @@ /obj/item/shard, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"jbN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "jcc" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -26169,14 +26187,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/lab) -"jtQ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "jtS" = ( /obj/structure/table/reinforced, /obj/machinery/power/apc/auto_name/directional/east, @@ -26324,6 +26334,15 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +"jwd" = ( +/obj/structure/cable, +/obj/structure/chair/office/light, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/virology) "jwj" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/siding/purple{ @@ -26969,6 +26988,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/grass, /area/station/security/prison/garden) +"jHf" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/virology) "jHg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28047,12 +28075,6 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/command/gateway) -"jYu" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) "jYv" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -29011,24 +29033,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) -"krt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wideplating_new{ - dir = 4 - }, -/obj/item/storage/toolbox/fishing, -/obj/item/storage/toolbox/fishing, -/obj/item/fishing_rod, -/obj/item/fishing_rod, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "krL" = ( /turf/open/floor/wood, /area/station/command/corporate_showroom) @@ -29067,6 +29071,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) +"ksN" = ( +/obj/structure/flora/bush/flowers_yw, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "ksT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -29247,6 +29255,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"kvP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "kvV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -29350,6 +29366,16 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/station/security/office) +"kxD" = ( +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/sign/clock/directional/south, +/turf/open/water, +/area/station/service/hydroponics/garden) "kxH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29647,12 +29673,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"kDc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "kDk" = ( /obj/machinery/door/airlock/security/glass{ name = "Permabrig Visitation" @@ -29867,6 +29887,15 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/engine, /area/station/science/explab) +"kIk" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) "kIG" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -30496,6 +30525,12 @@ /obj/machinery/shieldgen, /turf/open/floor/plating, /area/station/engineering/main) +"kTa" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) "kTn" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -30953,14 +30988,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/visit) -"lbH" = ( -/mob/living/basic/chicken{ - name = "Featherbottom"; - real_name = "Featherbottom" - }, -/obj/structure/flora/bush/fullgrass, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "lbL" = ( /obj/effect/decal/cleanable/insectguts, /obj/effect/turf_decal/siding/purple{ @@ -31020,20 +31047,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"ldg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/siding/wideplating_new/corner, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "lds" = ( /obj/structure/table, /obj/item/storage/fancy/egg_box, @@ -33562,13 +33575,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"mdY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "mei" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, @@ -33766,10 +33772,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"mie" = ( -/obj/structure/flora/bush/flowers_yw, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "mig" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -34685,6 +34687,19 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark/textured_large, /area/station/science/cytology) +"myA" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/plant_analyzer, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "myB" = ( /obj/structure/chair, /obj/structure/cable, @@ -37855,6 +37870,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"nzU" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) "nAb" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/landmark/event_spawn, @@ -40182,16 +40205,6 @@ }, /turf/open/floor/iron, /area/station/science/lab) -"otG" = ( -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) "otI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40654,16 +40667,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"oCO" = ( -/obj/structure/window/spawner/directional/west, -/obj/structure/window/spawner/directional/south, -/mob/living/basic/chicken{ - name = "Kentucky"; - real_name = "Kentucky" - }, -/obj/structure/flora/grass/jungle/b/style_random, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "oCR" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/suit_storage_unit/security, @@ -41729,6 +41732,15 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"oXH" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/water, +/area/station/service/hydroponics/garden) "oXJ" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -43773,6 +43785,24 @@ /obj/effect/mapping_helpers/airlock/access/any/command/eva, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"pIo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/item/storage/toolbox/fishing, +/obj/item/storage/toolbox/fishing, +/obj/item/fishing_rod, +/obj/item/fishing_rod, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "pIs" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44339,14 +44369,6 @@ /obj/item/reagent_containers/spray/pepper, /turf/open/floor/iron, /area/station/security/execution/transfer) -"pRM" = ( -/obj/structure/window/spawner/directional/south, -/mob/living/basic/cow{ - name = "Betsy"; - real_name = "Betsy" - }, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "pSa" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -44537,6 +44559,14 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"pVW" = ( +/mob/living/basic/chicken{ + name = "Featherbottom"; + real_name = "Featherbottom" + }, +/obj/structure/flora/bush/fullgrass, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "pVZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -45764,17 +45794,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/holding_cell) -"quN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/mining{ - name = "Deliveries" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/sorting) "qvl" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -48159,6 +48178,15 @@ /obj/machinery/recharge_station, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rkf" = ( +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/service/hydroponics/garden) "rkg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50253,14 +50281,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/lobby) -"rVP" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/medical/virology) "rVT" = ( /obj/structure/table, /obj/item/folder/white{ @@ -51466,6 +51486,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/construction/storage_wing) +"suI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) "suP" = ( /obj/structure/lattice, /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ @@ -54698,6 +54723,13 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"tzK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "tzP" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -54839,14 +54871,6 @@ /obj/effect/landmark/start/depsec/supply, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"tBY" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/cargo/sorting) "tCC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -55746,16 +55770,6 @@ /obj/effect/spawner/random/armory/barrier_grenades, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"tTS" = ( -/obj/structure/cable, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/virology) "tTT" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -57051,18 +57065,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"uqK" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 8 - }, -/obj/item/toy/figure/virologist{ - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/virology) "uqL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -59868,12 +59870,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"vmU" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) "vmX" = ( /obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, @@ -60048,6 +60044,14 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +"vpO" = ( +/obj/structure/window/spawner/directional/south, +/mob/living/basic/cow{ + name = "Betsy"; + real_name = "Betsy" + }, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "vpP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60581,6 +60585,15 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vzs" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "vzt" = ( /obj/structure/table/reinforced, /obj/machinery/airalarm/directional/north, @@ -63432,6 +63445,15 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"wwe" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/cargo_technician, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) "wwj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64527,11 +64549,6 @@ /obj/structure/table, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"wRF" = ( -/obj/structure/window/spawner/directional/west, -/obj/structure/flora/rock/pile, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "wRL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -65090,6 +65107,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"xbS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/sorting) "xbT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66166,15 +66191,6 @@ "xww" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tech) -"xwB" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/water, -/area/station/service/hydroponics/garden) "xwD" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/white, @@ -66351,16 +66367,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"xyI" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/sign/clock/directional/south, -/turf/open/water, -/area/station/service/hydroponics/garden) "xyM" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -67453,17 +67459,6 @@ }, /turf/closed/wall/r_wall, /area/station/hallway/primary/fore) -"xUE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/siding/wideplating_new, -/obj/structure/railing, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron, -/area/station/service/hydroponics/garden) "xUH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -82794,8 +82789,8 @@ xjH pIU dno uKy -rVP -uqK +fMC +jHf xjH nzQ vol @@ -83572,7 +83567,7 @@ pWX eYE hcR gqV -tTS +jwd vUH rUE suP @@ -86060,7 +86055,7 @@ paD ouc dSG cLj -jtQ +kvP cLj mUz pqJ @@ -86315,9 +86310,9 @@ sDP jBl jBl nNk -mdY -epl -kDc +tzK +vzs +hFj poj shx uKZ @@ -89936,11 +89931,11 @@ bzH bzH bzH raC -hsm -gDJ -hsR -tBY -quN +wwe +xbS +suI +nzU +fcw sXr ybn fLp @@ -104833,7 +104828,7 @@ jBY aKk lXl nzS -gpk +myA qXB kbo tbd @@ -105601,10 +105596,10 @@ lqQ fzr iCJ qgy -ldg -bYN -bYN -krt +fPj +rkf +rkf +pIo qXB psZ qXB @@ -105855,13 +105850,13 @@ lnc fDC qdy lqQ -wRF +iLj jzC -oCO -xUE -jYu -vmU -xyI +gqw +jbN +kTa +hlG +kxD qXB kbo qXB @@ -106112,13 +106107,13 @@ lnc cUP mil lqQ -lbH -mie -pRM -ivb -otG -ftQ -xwB +pVW +ksN +vpO +fdi +eiZ +kIk +oXH qXB psZ qXB diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index d18aadb0b0d..e5a6c1a9aeb 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -3415,7 +3415,6 @@ /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "aIA" = ( -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/duct, /turf/open/floor/carpet/green, @@ -5545,7 +5544,6 @@ dir = 1 }, /obj/structure/cable, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron, /area/station/medical/virology/isolation) "ben" = ( @@ -46727,7 +46725,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -115554,7 +115551,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 95f74e18ba9..1b3a5210ef0 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -92985,14 +92985,6 @@ dir = 1 }, /area/station/science/genetics) -"xRI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white, -/area/station/medical/virology) "xRJ" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/screwdriver, @@ -94315,7 +94307,6 @@ specialfunctions = 4 }, /obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "ykt" = ( @@ -196096,7 +196087,7 @@ iOA utl doh gJz -xRI +rPC hwQ piz aWO @@ -196610,7 +196601,7 @@ iOA dfU pZm wJy -xRI +rPC dVV bLm yhv diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 3ab36dba2ab..1b0c192f55b 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -22266,7 +22266,6 @@ /obj/effect/turf_decal/trimline/dark_green/filled/warning{ dir = 8 }, -/obj/effect/landmark/start/virologist, /obj/machinery/duct, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/smooth_edge{ @@ -37439,7 +37438,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, -/obj/effect/landmark/start/virologist, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -49091,7 +49089,6 @@ /area/station/commons/lounge) "nPC" = ( /obj/structure/cable, -/obj/effect/landmark/start/virologist, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64903,7 +64900,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/dark, /area/station/medical/break_room) "sfG" = ( @@ -65645,7 +65641,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white/smooth_large, /area/station/medical/virology) "sqD" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8966285031f..a3c1da4ae62 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3326,14 +3326,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"atX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/turbine_computer{ - mapping_id = "main_turbine" - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "auc" = ( /obj/effect/turf_decal/siding/thinplating/corner, /obj/structure/cable, @@ -3374,26 +3366,12 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"aum" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "auo" = ( /obj/machinery/power/turbine/inlet_compressor{ dir = 4 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"aup" = ( -/obj/machinery/power/turbine/core_rotor{ - dir = 4; - mapping_id = "main_turbine" - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "auq" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Utilities Access Hatch" @@ -8083,6 +8061,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/sorting) +"bLI" = ( +/obj/machinery/computer/security/telescreen{ + name = "turbine vent monitor"; + desc = "Used for watching the turbine vent."; + dir = 8; + pixel_x = 29; + network = list("turbine") + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "bLN" = ( /obj/machinery/door/airlock/security{ name = "Interrogation" @@ -8498,6 +8488,15 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"bUd" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/bed{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/virology) "bUh" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10406,6 +10405,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/tram/mid) +"czr" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/chair/stool/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/medical/virology) "czB" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 @@ -12726,16 +12732,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"dox" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/structure/bed{ - dir = 4 - }, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/dark, -/area/station/medical/virology) "doC" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/cable, @@ -14831,10 +14827,6 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/iron, /area/station/commons/storage/primary) -"ebp" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "ebq" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -15941,6 +15933,12 @@ /obj/structure/cable, /turf/open/floor/iron/freezer, /area/station/medical/coldroom) +"eyl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "eyy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -22843,14 +22841,6 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"heA" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/chair/stool/directional/east, -/obj/effect/landmark/start/virologist, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/virology) "heD" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 @@ -23560,6 +23550,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/fitness) +"hqY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "hrh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23987,18 +23984,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) -"hBY" = ( -/obj/machinery/computer/security/telescreen{ - name = "turbine vent monitor"; - desc = "Used for watching the turbine vent."; - dir = 8; - pixel_x = 29; - network = list("turbine") - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "hCp" = ( /obj/structure/chair/stool/bar/directional/north, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -24053,6 +24038,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"hDs" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/obj/machinery/light/directional/west, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "hDE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -33241,6 +33235,12 @@ "kLz" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) +"kLC" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/airless, +/area/space) "kLI" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -33565,12 +33565,6 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) -"kRk" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/airless, -/area/space) "kRm" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters" @@ -35782,6 +35776,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"lDG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/light/small/directional/west, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "lDM" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/item/radio/intercom/directional/south, @@ -36815,6 +36817,12 @@ /obj/machinery/light/dim/directional/south, /turf/open/floor/iron, /area/station/cargo/warehouse) +"lUD" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "lUE" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -40519,6 +40527,10 @@ /obj/machinery/barsign/directional/south, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"nmi" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "nmk" = ( /obj/structure/toilet{ pixel_y = 8 @@ -42632,13 +42644,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) -"nXQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/all_access, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "nYq" = ( /obj/structure/sign/directions/supply{ dir = 4; @@ -44472,6 +44477,9 @@ }, /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/asteroid) +"oMT" = ( +/turf/open/floor/plating/airless, +/area/space) "oMU" = ( /obj/structure/railing/corner{ dir = 4 @@ -46458,12 +46466,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/iron, /area/station/engineering/main) -"pxd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "pxf" = ( /obj/structure/closet/secure_closet/hos, /obj/structure/secure_safe/hos{ @@ -47157,14 +47159,6 @@ }, /turf/open/floor/circuit/green, /area/station/science/server) -"pIA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, -/obj/machinery/light/small/directional/west, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "pIF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48339,15 +48333,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/tram/right) -"qeq" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 10 - }, -/obj/machinery/light/directional/west, -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "qes" = ( /obj/machinery/door/airlock/grunge{ name = "Entertainment Center" @@ -50525,6 +50510,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/dorms) +"qTs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/turbine_computer{ + mapping_id = "main_turbine" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "qTt" = ( /obj/machinery/light_switch/directional/south, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -51836,12 +51829,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/dorms) -"rnA" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "rnK" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -53499,6 +53486,14 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"rTU" = ( +/obj/machinery/power/turbine/core_rotor{ + dir = 4; + mapping_id = "main_turbine" + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "rTZ" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, @@ -70647,9 +70642,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) -"xXn" = ( -/turf/open/floor/plating/airless, -/area/space) "xXt" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -70833,6 +70825,12 @@ }, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) +"ybb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "ybc" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery/white{ @@ -102996,7 +102994,7 @@ bVW xdC uKK nFu -qeq +hDs fal akJ tbc @@ -110998,10 +110996,10 @@ vde atC gqV atP -pxd -pIA -aum -aup +ybb +lDG +eyl +rTU hVG aac aac @@ -111252,10 +111250,10 @@ gjj rCd pts gEs -nXQ -rnA -hBY -atX +hqY +lUD +bLI +qTs wAQ qWU uue @@ -130819,8 +130817,8 @@ vXM vXM vXM vXM -ebp -xXn +nmi +oMT vXM vXM vXM @@ -131075,9 +131073,9 @@ vXM vXM vXM vXM -ebp -xXn -xXn +nmi +oMT +oMT vXM vXM vXM @@ -131332,9 +131330,9 @@ vXM vXM vXM vXM -ebp -kRk -ebp +nmi +kLC +nmi vXM vXM vXM @@ -131590,7 +131588,7 @@ vXM vXM vXM vXM -ebp +nmi vXM vXM vXM @@ -172663,7 +172661,7 @@ bWk svF xrG kow -heA +czr jqY jqY jqY @@ -173171,7 +173169,7 @@ whz aaa aaa ugt -dox +bUd vrJ aPS tMb diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 381fe5eef79..aed008e6a0c 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -544,7 +544,6 @@ /obj/item/modular_computer/pda/clown = list(REGION_GENERAL), \ /obj/item/modular_computer/pda/mime = list(REGION_GENERAL), \ /obj/item/modular_computer/pda/medical = list(REGION_MEDBAY), \ - /obj/item/modular_computer/pda/viro = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/coroner = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/engineering = list(REGION_ENGINEERING), \ /obj/item/modular_computer/pda/security = list(REGION_SECURITY), \ diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 469758d6da8..13add3508c7 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -126,7 +126,6 @@ #define SECHUD_SHAFT_MINER "hudshaftminer" #define SECHUD_STATION_ENGINEER "hudstationengineer" #define SECHUD_VETERAN_ADVISOR "hudveteranadvisor" -#define SECHUD_VIROLOGIST "hudvirologist" #define SECHUD_WARDEN "hudwarden" #define SECHUD_CHEF "hudchef" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 55a84617780..82565112a16 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -73,7 +73,6 @@ #define JOB_MEDICAL_DOCTOR "Medical Doctor" #define JOB_PARAMEDIC "Paramedic" #define JOB_CHEMIST "Chemist" -#define JOB_VIROLOGIST "Virologist" #define JOB_ORDERLY "Orderly" // SKYRAT EDIT ADDITION //Science #define JOB_SCIENTIST "Scientist" @@ -175,18 +174,17 @@ #define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 26 #define JOB_DISPLAY_ORDER_PARAMEDIC 27 #define JOB_DISPLAY_ORDER_CHEMIST 28 -#define JOB_DISPLAY_ORDER_VIROLOGIST 29 -#define JOB_DISPLAY_ORDER_CORONER 30 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 31 -#define JOB_DISPLAY_ORDER_SCIENTIST 32 -#define JOB_DISPLAY_ORDER_ROBOTICIST 33 -#define JOB_DISPLAY_ORDER_GENETICIST 34 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 35 -#define JOB_DISPLAY_ORDER_VETERAN_ADVISOR 36 -#define JOB_DISPLAY_ORDER_WARDEN 37 -#define JOB_DISPLAY_ORDER_DETECTIVE 38 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 39 -#define JOB_DISPLAY_ORDER_PRISONER 40 +#define JOB_DISPLAY_ORDER_CORONER 29 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 30 +#define JOB_DISPLAY_ORDER_SCIENTIST 31 +#define JOB_DISPLAY_ORDER_ROBOTICIST 32 +#define JOB_DISPLAY_ORDER_GENETICIST 33 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 34 +#define JOB_DISPLAY_ORDER_VETERAN_ADVISOR 35 +#define JOB_DISPLAY_ORDER_WARDEN 36 +#define JOB_DISPLAY_ORDER_DETECTIVE 37 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38 +#define JOB_DISPLAY_ORDER_PRISONER 39 #define JOB_DISPLAY_ORDER_SECURITY_MEDIC 100 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 101 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 102 //SKYRAT EDIT ADDITON diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 771cdd12e10..93edea10b41 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -1,6 +1,6 @@ /* - Advance Disease is a system for Virologist to Engineer their own disease with symptoms that have effects and properties + Advance Disease is a system for medical to Engineer their own disease with symptoms that have effects and properties which add onto the overall disease. If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus. @@ -17,7 +17,7 @@ */ /datum/disease/advance - name = "Unknown" // We will always let our Virologist name our disease. + name = "Unknown" // We will always let our creator name our disease. desc = "An engineered disease which can contain a multitude of symptoms." form = "Advanced Disease" // Will let med-scanners know that this disease was engineered. agent = "advance microbes" diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 3d94c8645b5..cfa608011bd 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -1213,30 +1213,6 @@ if(CONFIG_GET(flag/security_has_maint_access)) access |= list(ACCESS_MAINT_TUNNELS) -/datum/id_trim/job/virologist - assignment = "Virologist" - trim_state = "trim_virologist" - department_color = COLOR_MEDICAL_BLUE - subdepartment_color = COLOR_MEDICAL_BLUE - sechud_icon_state = SECHUD_VIROLOGIST - minimal_access = list( - ACCESS_MECH_MEDICAL, - ACCESS_MEDICAL, - ACCESS_MINERAL_STOREROOM, - ACCESS_VIROLOGY, - ACCESS_PHARMACY, - ) - extra_access = list( - ACCESS_PLUMBING, - ACCESS_MORGUE, - ACCESS_SURGERY, - ) - template_access = list( - ACCESS_CAPTAIN, - ACCESS_CHANGE_IDS, - ACCESS_CMO, - ) - job = /datum/job/virologist /datum/id_trim/job/warden assignment = "Warden" diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 89c3a51c60c..f0dcd802001 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -598,7 +598,7 @@ //if engineering isnt valid, just send it to the bridge send_supply_pod_to_area(supply_pack_shielding.generate(null), /area/station/command/bridge, /obj/structure/closet/supplypod/centcompod) - // Let the viro know resistence is futile + // Let medical know resistence is futile send_fax_to_area(new /obj/item/paper/fluff/radiation_nebula_virologist(), /area/station/medical/virology, "NT Virology Department", \ force = TRUE, force_pod_type = /obj/structure/closet/supplypod/centcompod) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 22d5fb04339..f93ce4989d4 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -233,7 +233,6 @@ /datum/job/security_officer = /obj/item/organ/internal/cyberimp/arm/flash, /datum/job/shaft_miner = /obj/item/organ/internal/monster_core/rush_gland, /datum/job/station_engineer = /obj/item/organ/internal/cyberimp/arm/toolset, - /datum/job/virologist = /obj/item/organ/internal/lungs/cybernetic/tier2, /datum/job/warden = /obj/item/organ/internal/cyberimp/eyes/hud/security, // SKYRAT EDIT ADDITION START - MODULAR JOBS /datum/job/blueshield = /obj/item/organ/internal/cyberimp/brain/anti_stun, diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 5396655e28c..448e43893b8 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -580,7 +580,7 @@ /datum/objective_item/steal/traitor/moth_plush name = "cute moth plush toy" targetitem = /obj/item/toy/plush/moth - excludefromjob = list(JOB_PSYCHOLOGIST, JOB_PARAMEDIC, JOB_CHEMIST, JOB_MEDICAL_DOCTOR, JOB_VIROLOGIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_CORONER) + excludefromjob = list(JOB_PSYCHOLOGIST, JOB_PARAMEDIC, JOB_CHEMIST, JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CORONER) exists_on_map = TRUE difficulty = 1 steal_hint = "A moth plush toy. The Psychologist has one to help console patients." diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 1f30aa758f6..9939330990b 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -114,12 +114,11 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, - JOB_VIROLOGIST = 22, - JOB_MEDICAL_DOCTOR = 23, - JOB_PARAMEDIC = 24, - JOB_CORONER = 25, - JOB_ORDERLY = 26, // SKYRAT EDIT ADDITION - JOB_PSYCHOLOGIST = 27, // SKYRAT EDIT - ORIGINAL: JOB_PSYCHOLOGIST = 71, + JOB_MEDICAL_DOCTOR = 22, + JOB_PARAMEDIC = 23, + JOB_CORONER = 24, + JOB_ORDERLY = 25, // SKYRAT EDIT ADDITION + JOB_PSYCHOLOGIST = 26, // SKYRAT EDIT - ORIGINAL: JOB_PSYCHOLOGIST = 71, // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, diff --git a/code/game/machinery/nebula_shielding.dm b/code/game/machinery/nebula_shielding.dm index cd10a23150c..10306177ebf 100644 --- a/code/game/machinery/nebula_shielding.dm +++ b/code/game/machinery/nebula_shielding.dm @@ -145,7 +145,7 @@ More circuit boards can be ordered through cargo. Consider setting up auxillary shielding units in-case of destruction, power loss or sabotage. "} -/// Warns the viro that they can't use radioactive resonance +/// Warns medical that they can't use radioactive resonance /obj/item/paper/fluff/radiation_nebula_virologist name = "radioactive resonance" default_raw_text = {"EXTREME IMPORTANCE!!!!
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index f5daba8135c..2839055a3db 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -196,9 +196,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Chief Medical Officer" icon_state = "Chief Medical Officer" -/obj/effect/landmark/start/virologist - name = "Virologist" - icon_state = "Virologist" /obj/effect/landmark/start/psychologist name = "Psychologist" diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e6c221793d6..9af23545c6f 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -467,9 +467,6 @@ /obj/item/reagent_containers/syringe, )) -/* - * Biowaste bag (mostly for virologists) - */ /obj/item/storage/bag/bio name = "bio bag" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a32d4c9f5ac..b2cc7544e10 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -128,11 +128,11 @@ force = 0 var/random_color = TRUE /// the string of the dmi state the balloon has while on the floor. - var/world_state + var/world_state /// the string of the dmi state the balloon has while in your inventory. - var/storage_state + var/storage_state /// the string describing the name of balloon's current colour. - var/current_color + var/current_color /obj/item/toy/balloon/long name = "long balloon" @@ -183,9 +183,9 @@ ) for(var/list/pair_of_colors in balloon_combos) if((hit_by.current_color == pair_of_colors[1] && current_color == pair_of_colors[2]) || (current_color == pair_of_colors[1] && hit_by.current_color == pair_of_colors[2])) - var/path_to_spawn = balloon_combos[pair_of_colors] + var/path_to_spawn = balloon_combos[pair_of_colors] user.put_in_hands(new path_to_spawn) - break + break qdel(hit_by) qdel(src) return TRUE @@ -1386,10 +1386,6 @@ toysay = "I am the law!" toysound = 'sound/runtime/complionator/dredd.ogg' -/obj/item/toy/figure/virologist - name = "\improper Virologist action figure" - icon_state = "virologist" - toysay = "The cure is potassium!" /obj/item/toy/figure/warden name = "\improper Warden action figure" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index ba2a8685b8b..32ed0d14d87 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -223,7 +223,7 @@ LINEN BINS /obj/item/bedsheet/medical name = "medical blanket" - desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station." + desc = "It's a 'sterilized' blanket commonly used in the Medbay." icon_state = "sheetmedical" inhand_icon_state = "sheetmedical" dream_messages = list("healing", "life", "surgery", "a doctor") diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index 0d62ecece5f..9182f23a649 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -41,10 +41,10 @@ target_jobs = list( // Medical /datum/job/doctor, - /datum/job/virologist, /datum/job/paramedic, /datum/job/psychologist, /datum/job/chemist, + /datum/job/coroner, // Service /datum/job/clown, /datum/job/botanist, @@ -76,6 +76,7 @@ telecrystal_reward = list(1, 2) target_jobs = list( // Cargo + /datum/job/bitrunner, /datum/job/shaft_miner, // Service /datum/job/chaplain, @@ -100,6 +101,7 @@ /datum/job/chief_medical_officer, /datum/job/research_director, /datum/job/quartermaster, + /datum/job/chief_engineer, ) /datum/traitor_objective/destroy_heirloom/captain diff --git a/code/modules/antagonists/traitor/objectives/kidnapping.dm b/code/modules/antagonists/traitor/objectives/kidnapping.dm index d6aec912fdb..ea7fef9b4b6 100644 --- a/code/modules/antagonists/traitor/objectives/kidnapping.dm +++ b/code/modules/antagonists/traitor/objectives/kidnapping.dm @@ -48,7 +48,7 @@ /datum/job/chemist, /datum/job/doctor, /datum/job/psychologist, - /datum/job/virologist, + /datum/job/coroner, // Science /datum/job/geneticist, /datum/job/roboticist, @@ -80,6 +80,7 @@ target_jobs = list( // Cargo + /datum/job/bitrunner, /datum/job/shaft_miner, // Medical /datum/job/paramedic, diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index 5a31c4c1739..5f3e2387a35 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -66,7 +66,6 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han telecrystal_reward = list(3, 4) progression_minimum = 15 MINUTES - progression_maximum = 30 MINUTES applicable_jobs = list( JOB_STATION_ENGINEER = /obj/machinery/telecomms/hub, diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index e3a396609eb..a0f2971df23 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -4,8 +4,8 @@ scan everyone in sight" department_head = list(JOB_CHIEF_MEDICAL_OFFICER) faction = FACTION_STATION - total_positions = 5 - spawn_positions = 3 + total_positions = 6 + spawn_positions = 4 supervisors = SUPERVISOR_CMO exp_granted_type = EXP_TYPE_CREW config_tag = "MEDICAL_DOCTOR" diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm deleted file mode 100644 index bdbfd7d687c..00000000000 --- a/code/modules/jobs/job_types/virologist.dm +++ /dev/null @@ -1,60 +0,0 @@ -/datum/job/virologist - title = JOB_VIROLOGIST - description = "Study the effects of various diseases and synthesize a \ - vaccine for them. Engineer beneficial viruses." - department_head = list(JOB_CHIEF_MEDICAL_OFFICER) - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = SUPERVISOR_CMO - exp_requirements = 60 - exp_required_type = EXP_TYPE_CREW - exp_granted_type = EXP_TYPE_CREW - config_tag = "VIROLOGIST" - - outfit = /datum/outfit/job/virologist - plasmaman_outfit = /datum/outfit/plasmaman/viro - - paycheck = PAYCHECK_CREW - paycheck_department = ACCOUNT_MED - - liver_traits = list(TRAIT_MEDICAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_VIROLOGIST - bounty_types = CIV_JOB_VIRO - departments_list = list( - /datum/job_department/medical, - ) - - family_heirlooms = list(/obj/item/reagent_containers/syringe, /obj/item/statuebust/hippocratic) - - mail_goodies = list( - /obj/item/reagent_containers/cup/bottle/random_virus = 15, - /obj/item/reagent_containers/cup/bottle/formaldehyde = 10, - /obj/item/reagent_containers/cup/bottle/synaptizine = 10, - /obj/item/stack/sheet/mineral/plasma = 10, - /obj/item/stack/sheet/mineral/uranium = 5, - ) - rpg_title = "Plague Doctor" - job_flags = STATION_JOB_FLAGS - - -/datum/outfit/job/virologist - name = "Virologist" - jobtype = /datum/job/virologist - - id_trim = /datum/id_trim/job/virologist - uniform = /obj/item/clothing/under/rank/medical/virologist - suit = /obj/item/clothing/suit/toggle/labcoat/virologist - suit_store = /obj/item/flashlight/pen - belt = /obj/item/modular_computer/pda/viro - ears = /obj/item/radio/headset/headset_med - mask = /obj/item/clothing/mask/surgical - shoes = /obj/item/clothing/shoes/sneakers/white - - backpack = /obj/item/storage/backpack/virology - satchel = /obj/item/storage/backpack/satchel/vir - duffelbag = /obj/item/storage/backpack/duffelbag/virology - messenger = /obj/item/storage/backpack/messenger/vir - - box = /obj/item/storage/box/survival/medical diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 547e85dd1b0..d27fd1e593f 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -230,15 +230,6 @@ /datum/computer_file/program/radar/lifeline, ) -/obj/item/modular_computer/pda/viro - name = "virology PDA" - greyscale_config = /datum/greyscale_config/tablet/stripe_double - greyscale_colors = "#FAFAFA#355FAC#57C451" - starting_programs = list( - /datum/computer_file/program/records/medical, - /datum/computer_file/program/robocontrol, - ) - /obj/item/modular_computer/pda/chemist name = "chemist PDA" greyscale_config = /datum/greyscale_config/tablet/stripe_thick diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/surgery/sleeper_protocol.dm similarity index 50% rename from code/modules/antagonists/traitor/objectives/sleeper_protocol.dm rename to code/modules/surgery/sleeper_protocol.dm index f28a79d6926..693b0fbfb5c 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/surgery/sleeper_protocol.dm @@ -1,71 +1,3 @@ -/datum/traitor_objective_category/sleeper_protocol - name = "Sleeper Protocol" - objectives = list( - /datum/traitor_objective/sleeper_protocol = 1, - /datum/traitor_objective/sleeper_protocol/everybody = 1, - ) - -/datum/traitor_objective/sleeper_protocol - name = "Perform the sleeper protocol on a crewmember" - description = "Use the button below to materialize a surgery disk in your hand, where you'll then be able to perform the sleeper protocol on a crewmember. If the disk gets destroyed, the objective will fail. This will only work on living and sentient crewmembers." - - progression_minimum = 0 MINUTES - - progression_reward = list(8 MINUTES, 15 MINUTES) - telecrystal_reward = 1 - - var/list/limited_to = list( - JOB_CHIEF_MEDICAL_OFFICER, - JOB_MEDICAL_DOCTOR, - JOB_PARAMEDIC, - JOB_VIROLOGIST, - JOB_ROBOTICIST, - ) - - var/obj/item/disk/surgery/sleeper_protocol/disk - - var/mob/living/current_registered_mob - - var/inverted_limitation = FALSE - -/datum/traitor_objective/sleeper_protocol/generate_ui_buttons(mob/user) - var/list/buttons = list() - if(!disk) - buttons += add_ui_button("", "Clicking this will materialize the sleeper protocol surgery in your hand", "save", "summon_disk") - return buttons - -/datum/traitor_objective/sleeper_protocol/ui_perform_action(mob/living/user, action) - switch(action) - if("summon_disk") - if(disk) - return - disk = new(user.drop_location()) - user.put_in_hands(disk) - AddComponent(/datum/component/traitor_objective_register, disk, \ - fail_signals = list(COMSIG_QDELETING)) - -/datum/traitor_objective/sleeper_protocol/proc/on_surgery_success(datum/source, datum/surgery_step/step, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) - SIGNAL_HANDLER - if(istype(step, /datum/surgery_step/brainwash/sleeper_agent)) - succeed_objective() - -/datum/traitor_objective/sleeper_protocol/can_generate_objective(datum/mind/generating_for, list/possible_duplicates) - var/datum/job/job = generating_for.assigned_role - if(!(job.title in limited_to) && !inverted_limitation) - return FALSE - if((job.title in limited_to) && inverted_limitation) - return FALSE - if(length(possible_duplicates) > 0) - return FALSE - return TRUE - -/datum/traitor_objective/sleeper_protocol/generate_objective(datum/mind/generating_for, list/possible_duplicates) - AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = PROC_REF(on_surgery_success))) - return TRUE - -/datum/traitor_objective/sleeper_protocol/ungenerate_objective() - disk = null /obj/item/disk/surgery/sleeper_protocol name = "Suspicious Surgery Disk" desc = "The disk provides instructions on how to turn someone into a sleeper agent for the Syndicate." @@ -129,10 +61,3 @@ if(!.) return target.gain_trauma(new /datum/brain_trauma/mild/phobia/conspiracies(), TRAUMA_RESILIENCE_LOBOTOMY) - -/datum/traitor_objective/sleeper_protocol/everybody //Much harder for non-med and non-robo - progression_minimum = 30 MINUTES - progression_reward = list(8 MINUTES, 15 MINUTES) - telecrystal_reward = 1 - - inverted_limitation = TRUE diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 5df6e03de70..d719ebc9e05 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi index 48b69e09de6..712c19a2e97 100644 Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ diff --git a/modular_skyrat/master_files/code/game/objects/items/toys.dm b/modular_skyrat/master_files/code/game/objects/items/toys.dm new file mode 100644 index 00000000000..5bbb20cbb75 --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/items/toys.dm @@ -0,0 +1,5 @@ +/obj/item/toy/figure/virologist + name = "\improper Virologist action figure" + icon = 'modular_skyrat/master_files/icons/obj/toys/toy.dmi' + icon_state = "virologist" + toysay = "The cure is potassium!" diff --git a/modular_skyrat/master_files/icons/obj/toys/toy.dmi b/modular_skyrat/master_files/icons/obj/toys/toy.dmi new file mode 100644 index 00000000000..0278f3081d8 Binary files /dev/null and b/modular_skyrat/master_files/icons/obj/toys/toy.dmi differ diff --git a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm index c6ae2743a91..627e32dfa83 100644 --- a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm +++ b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm @@ -234,6 +234,10 @@ "Physician", "Surgeon", "Medical Student", + "Virologist", + "Epidemiologist", + "Pathologist", + "Junior Pathologist", ) /datum/job/engineering_guard //see orderly @@ -407,14 +411,6 @@ "Apprentice Engineer", ) -/datum/job/virologist - alt_titles = list( - "Virologist", - "Epidemiologist", - "Pathologist", - "Junior Pathologist", - ) - /datum/job/warden alt_titles = list( "Warden", diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 460156e7779..10dd02ba7c9 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -74,7 +74,7 @@ name = "XuraCorp Biohazard Underfitting" item_path = /obj/item/clothing/under/plasmaman/jax2 ckeywhitelist = list("candlejax") - restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST, JOB_GENETICIST) + restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_GENETICIST) /datum/loadout_item/head/emissionhelm name = "Emission's Helmet" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm index a30e25c923f..0a1d94de1b5 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm @@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/medicpatch name = "Medical Eyepatch (Skyrat)" item_path = /obj/item/clothing/glasses/hud/eyepatch/med - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/robopatch name = "Diagnostic Eyepatch" @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/scipatch name = "Science Eyepatch" item_path = /obj/item/clothing/glasses/hud/eyepatch/sci - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /datum/loadout_item/glasses/mesonpatch name = "Meson Eyepatch" @@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/medhud_glasses name = "Prescription Medical HUD" item_path = /obj/item/clothing/glasses/hud/health/prescription - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/diaghud_glasses name = "Prescription Diagnostic HUD" @@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/science_glasses name = "Prescription Science glasses" item_path = /obj/item/clothing/glasses/hud/science/prescription - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /datum/loadout_item/glasses/aviator_security name = "Security HUD Aviators" @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/aviator_health name = "Medical HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/health - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/aviator_meson name = "Meson HUD Aviators" @@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/aviator_science name = "Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /datum/loadout_item/glasses/prescription_aviator_security @@ -231,7 +231,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/prescription_aviator_health name = "Prescription Medical HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/health/prescription - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/prescription_aviator_meson name = "Prescription Meson HUD Aviators" @@ -246,7 +246,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/prescription_aviator_science name = "Prescription Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science/prescription - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /datum/loadout_item/glasses/retinal_projector_security name = "Retinal Projector Security HUD" @@ -256,7 +256,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/retinal_projector_health name = "Retinal Projector Health HUD" item_path = /obj/item/clothing/glasses/hud/ar/projector/health - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/retinal_projector_meson name = "Retinal Projector Meson HUD" @@ -271,7 +271,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/retinal_projector_science name = "Science Retinal Projector" item_path = /obj/item/clothing/glasses/hud/ar/projector/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) /* * FAMILIES diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 7444d9618ac..11ba23c667b 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -120,6 +120,10 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Medical Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/medical +/datum/loadout_item/suit/labcoat_viro + name = "Virologist's Labcoat" + item_path = /obj/item/clothing/suit/toggle/labcoat/virologist + /datum/loadout_item/suit/labcoat_regular name = "Researcher's Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/regular diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 508966f1aed..63635edca5c 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -178,6 +178,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Chemist's Formal Jumpskirt" item_path = /obj/item/clothing/under/rank/medical/chemist/skyrat/formal/skirt +/datum/loadout_item/under/jumpsuit/viro_jumpsuit + name = "Virologist's Jumpsuit" + item_path = /obj/item/clothing/under/rank/medical/virologist + /datum/loadout_item/under/jumpsuit/hlscientist name = "Ridiculous Scientist Outfit" item_path = /obj/item/clothing/under/rank/rnd/scientist/skyrat/hlscience diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index 4e553ed712a..7220b3a1e4f 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -9,7 +9,10 @@ /obj/item/clothing/under/rank/medical/scrubs/skyrat/white = 4, /obj/item/clothing/under/rank/medical/doctor/skyrat/utility = 4, /obj/item/clothing/suit/toggle/labcoat/medical = 4, + /obj/item/clothing/under/rank/medical/virologist = 4, + /obj/item/clothing/suit/toggle/labcoat/virologist = 4, /obj/item/storage/backpack/messenger/med = 4, + /obj/item/storage/backpack/messenger/vir = 4 ) /obj/machinery/vending/wardrobe/engi_wardrobe diff --git a/tgstation.dme b/tgstation.dme index 8a6dcd27f7c..9dfb62ddfc1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3336,7 +3336,6 @@ #include "code\modules\antagonists\traitor\objectives\kill_pet.dm" #include "code\modules\antagonists\traitor\objectives\locate_weakpoint.dm" #include "code\modules\antagonists\traitor\objectives\sabotage_machinery.dm" -#include "code\modules\antagonists\traitor\objectives\sleeper_protocol.dm" #include "code\modules\antagonists\traitor\objectives\steal.dm" #include "code\modules\antagonists\traitor\objectives\abstract\target_player.dm" #include "code\modules\antagonists\traitor\objectives\final_objective\battle_royale.dm" @@ -4368,7 +4367,6 @@ #include "code\modules\jobs\job_types\shaft_miner.dm" #include "code\modules\jobs\job_types\station_engineer.dm" #include "code\modules\jobs\job_types\unassigned.dm" -#include "code\modules\jobs\job_types\virologist.dm" #include "code\modules\jobs\job_types\warden.dm" #include "code\modules\jobs\job_types\antagonists\abductor_agent.dm" #include "code\modules\jobs\job_types\antagonists\abductor_scientist.dm" @@ -5916,6 +5914,7 @@ #include "code\modules\surgery\prosthetic_replacement.dm" #include "code\modules\surgery\repair_puncture.dm" #include "code\modules\surgery\revival.dm" +#include "code\modules\surgery\sleeper_protocol.dm" #include "code\modules\surgery\stomachpump.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\surgery\surgery_helpers.dm" @@ -6397,6 +6396,7 @@ #include "modular_skyrat\master_files\code\game\objects\items\RCD.dm" #include "modular_skyrat\master_files\code\game\objects\items\religion.dm" #include "modular_skyrat\master_files\code\game\objects\items\scratchingstone.dm" +#include "modular_skyrat\master_files\code\game\objects\items\toys.dm" #include "modular_skyrat\master_files\code\game\objects\items\wiki_manuals.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\anomaly_neutralizer.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\chameleonproj.dm" diff --git a/tgui/packages/tgui/interfaces/common/JobToIcon.ts b/tgui/packages/tgui/interfaces/common/JobToIcon.ts index 0e8f8e184dd..2e208e7a838 100644 --- a/tgui/packages/tgui/interfaces/common/JobToIcon.ts +++ b/tgui/packages/tgui/interfaces/common/JobToIcon.ts @@ -56,7 +56,6 @@ const BASEICONS = { 'Station Engineer': 'gears', 'Syndicate Operative': 'dragon', 'Veteran Security Advisor': 'ribbon', - Virologist: 'virus', Warden: 'handcuffs', // SKYRAT EDIT START - Skyrat-exclusive jobs have icons too Barber: 'scissors', @@ -271,6 +270,7 @@ const ALTTITLES = { 'Apprentice Engineer': BASEICONS['Station Engineer'], 'Engineering Trainee': BASEICONS['Station Engineer'], // Virologist - virus + Virologist: 'virus', Pathologist: BASEICONS['Virologist'], 'Junior Pathologist': BASEICONS['Virologist'], // Warden - handcuffs