From 2d5736a61cbb326538274a2b7001bc9b5a850a29 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon, 6 Dec 2021 14:00:43 +0000 Subject: [PATCH] Removes brig phys, adds another officer slot to compensate (#17180) --- _maps/map_files/Delta/delta.dmm | 423 ++--------- _maps/map_files/MetaStation/MetaStation.dmm | 396 ++-------- _maps/map_files/cyberiad/cyberiad.dmm | 677 ++++-------------- code/__DEFINES/job.dm | 4 +- code/__HELPERS/mobs.dm | 2 +- code/_globalvars/lists/flavor_misc.dm | 2 +- code/datums/datacore.dm | 4 - code/game/area/ss13_areas.dm | 4 - code/game/gamemodes/changeling/changeling.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/shadowling/shadowling.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/gamemodes/vampire/traitor_vamp.dm | 2 +- code/game/gamemodes/vampire/vampire.dm | 2 +- code/game/jobs/job/security.dm | 32 - code/game/jobs/jobs.dm | 2 - code/game/machinery/computer/card.dm | 1 - code/game/machinery/tcomms/nttc.dm | 1 - .../objects/items/devices/radio/headset.dm | 4 - .../crates_lockers/closets/cardboardbox.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 26 - .../arcade/mob_hunt/mob_type_datums.dm | 1 - code/modules/client/preference/character.dm | 29 +- .../preference/loadout/loadout_accessories.dm | 8 +- .../preference/loadout/loadout_general.dm | 2 +- .../client/preference/loadout/loadout_hat.dm | 2 +- .../preference/loadout/loadout_racial.dm | 2 +- .../client/preference/loadout/loadout_suit.dm | 2 +- .../preference/loadout/loadout_uniform.dm | 5 - code/modules/clothing/suits/jobs.dm | 15 - code/modules/clothing/under/jobs/security.dm | 18 - code/modules/karma/karma_holder.dm | 11 +- .../living/carbon/human/species/plasmaman.dm | 2 +- code/modules/newscaster/obj/newscaster.dm | 1 - .../reagents/chemistry/reagents/food.dm | 2 +- config/example/config.toml | 2 +- 37 files changed, 292 insertions(+), 1404 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 299dfc4771c..a9641da0cd2 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -13257,11 +13257,11 @@ }, /area/crew_quarters/bar) "aMj" = ( -/mob/living/carbon/human/monkey/punpun, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/mob/living/carbon/human/monkey/punpun, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -14422,12 +14422,12 @@ }, /area/security/permabrig) "aPb" = ( -/mob/living/simple_animal/mouse, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/mob/living/simple_animal/mouse, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -22361,9 +22361,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) -"bex" = ( -/turf/simulated/wall/r_wall, -/area/security/medbay) "bey" = ( /obj/structure/cable{ d1 = 1; @@ -22954,20 +22951,6 @@ }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) -"bfR" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitered" - }, -/area/security/medbay) "bfS" = ( /obj/machinery/camera{ c_tag = "Perma-Brig Escape Pod"; @@ -23507,53 +23490,6 @@ icon_state = "neutralfull" }, /area/storage/primary) -"bha" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/medbay) -"bhb" = ( -/obj/structure/table/glass, -/obj/item/clothing/accessory/stethoscope, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/medbay) -"bhc" = ( -/obj/structure/sink{ - pixel_y = 25 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitered" - }, -/area/security/medbay) -"bhd" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/medbay) "bhf" = ( /obj/machinery/photocopier/faxmachine/longrange{ department = "Magistrate's Office" @@ -24203,57 +24139,6 @@ }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) -"biq" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/security/medbay) -"bir" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/medbay) -"bis" = ( -/obj/machinery/camera{ - c_tag = "Brigbay"; - network = list("SS13","Security") - }, -/obj/machinery/iv_drip, -/obj/structure/bed, -/obj/machinery/vending/wallmed{ - pixel_y = 28 - }, -/obj/item/bedsheet/blue, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitered" - }, -/area/security/medbay) "biu" = ( /obj/structure/cable{ d1 = 1; @@ -25068,116 +24953,14 @@ icon_state = "yellowcorner" }, /area/hallway/primary/port) -"bjY" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/security/medbay) -"bjZ" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/medbay) -"bka" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) -"bkb" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) -"bkc" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Brig Medical Bay"; - req_one_access_txt = "63" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/medbay) "bkd" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + icon_state = "1-4"; + tag = "90Curve" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26024,49 +25807,6 @@ icon_state = "red" }, /area/security/permabrig) -"blS" = ( -/obj/structure/closet/secure_closet/brigdoc, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitered" - }, -/area/security/medbay) -"blT" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 0; - icon_state = "whitered" - }, -/area/security/medbay) -"blU" = ( -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitered" - }, -/area/security/medbay) -"blV" = ( -/obj/structure/sign/greencross{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/brig) "blW" = ( /obj/structure/cable{ d1 = 1; @@ -26155,7 +25895,7 @@ }, /area/security/main) "bmf" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -26754,23 +26494,6 @@ icon_state = "red" }, /area/security/brig) -"bnq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) "bnr" = ( /obj/structure/cable{ d1 = 4; @@ -27477,15 +27200,6 @@ icon_state = "red" }, /area/security/prisonershuttle) -"boR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/brig) "boS" = ( /obj/effect/landmark{ name = "lightsout" @@ -28586,19 +28300,6 @@ icon_state = "red" }, /area/security/prisonershuttle) -"bqQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/security/brig) "bqR" = ( /obj/structure/cable{ d1 = 1; @@ -29513,10 +29214,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - name = "Brig Physisian Junction"; - sortType = 24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -29983,14 +29682,6 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/fore) -"btG" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/medbay) "btH" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -43239,7 +42930,6 @@ }, /area/turret_protected/aisat) "bTD" = ( -/mob/living/simple_animal/bot/secbot/pingsky, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -43252,6 +42942,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/mob/living/simple_animal/bot/secbot/pingsky, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -44299,7 +43990,6 @@ codes_txt = "patrol;next_patrol=hall12"; location = "hall11" }, -/mob/living/simple_animal/bot/secbot/beepsky, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -44311,6 +44001,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/mob/living/simple_animal/bot/secbot/beepsky, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -78518,8 +78209,8 @@ /obj/structure/bed/dogbed{ name = "kitty basket" }, -/mob/living/simple_animal/pet/cat/Runtime, /obj/structure/disposalpipe/segment, +/mob/living/simple_animal/pet/cat/Runtime, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -87244,10 +86935,10 @@ /obj/machinery/light/small{ dir = 1 }, -/mob/living/carbon/human/monkey, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -87269,10 +86960,10 @@ /obj/machinery/light/small{ dir = 1 }, -/mob/living/carbon/human/monkey, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -89640,9 +89331,9 @@ name = "revenantspawn" }, /obj/effect/decal/warning_stripes/yellow, -/mob/living/carbon/human/monkey, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -93484,8 +93175,8 @@ /obj/effect/landmark{ name = "revenantspawn" }, -/mob/living/simple_animal/pet/dog/pug, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/mob/living/simple_animal/pet/dog/pug, /turf/simulated/floor/engine, /area/toxins/explab) "fjJ" = ( @@ -98816,18 +98507,6 @@ icon_state = "vault" }, /area/security/securearmoury) -"uKI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) "uQK" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -99603,12 +99282,12 @@ codes_txt = "patrol;next_patrol=Armory_South"; location = "Armory_North" }, -/mob/living/simple_animal/bot/secbot/armsky{ - auto_patrol = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/mob/living/simple_animal/bot/secbot/armsky{ + auto_patrol = 1 + }, /turf/simulated/floor/plasteel, /area/security/securearmoury) "xpu" = ( @@ -150386,12 +150065,12 @@ mhu aaa aaa aaa -bex -bex -bha -biq -bjY -bex +abj +aaa +aaa +aaa +aaa +aaa bno boM bqM @@ -150643,12 +150322,12 @@ mhu cFP bbn ygH -bex -bfR -bhb -bir -bjZ -blS +ygH +aaa +aaa +aaa +aaa +aaa bno boN bqN @@ -150900,12 +150579,12 @@ pcv aZE bbo bcV -bex -bhc -uKI -bnq -bka -blT +ygH +aaa +aaa +aaa +aaa +aaa bno boO bru @@ -151157,12 +150836,12 @@ ppj aZF bbp bcV -bex -bis -bhd -btG -bkb -blU +ygH +aaa +aaa +aaa +aaa +aaa bno boP bqO @@ -151416,10 +151095,10 @@ bbq ygH ygH ygH -bex -bha -bkc -bjY +bno +bno +bno +bno bno bno bno @@ -151676,10 +151355,10 @@ bfV bhg biu bkd -blV -boR -boR -bqQ +bnp +bnp +bnp +gKi bsI bnp gKi diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8c1fc963466..641497fe8f4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3535,16 +3535,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"ajr" = ( -/obj/structure/window/reinforced, -/obj/structure/table, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/masks, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/brig) "ajw" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -5640,17 +5630,6 @@ icon_state = "showroomfloor" }, /area/security/main) -"anS" = ( -/obj/machinery/alarm{ - pixel_y = 24 - }, -/obj/structure/table, -/obj/machinery/computer/med_data/laptop, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitered" - }, -/area/security/brig) "anT" = ( /obj/machinery/newscaster/security_unit{ pixel_x = -32; @@ -5855,22 +5834,11 @@ /turf/simulated/wall, /area/security/evidence) "aor" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Brig - Infirmary"; - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/closet/secure_closet/brigdoc, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -5880,10 +5848,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitered" +/obj/machinery/door/airlock/maintenance{ + name = "Brig Maintenance"; + req_one_access_txt = "63" }, +/turf/simulated/floor/plating, /area/security/brig) "aot" = ( /obj/structure/closet{ @@ -6016,19 +5985,6 @@ /obj/item/stack/packageWrap, /turf/simulated/floor/plasteel, /area/security/main) -"aoM" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/cleaner, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitered" - }, -/area/security/brig) "aoS" = ( /obj/machinery/conveyor/north{ id = "garbage" @@ -6077,28 +6033,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) -"aoW" = ( -/obj/structure/table, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/healthanalyzer, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitered" - }, -/area/security/brig) "aoX" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -6203,41 +6137,12 @@ icon_state = "redcorner" }, /area/security/brig) -"apj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "apk" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/sleep) -"apl" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/pen{ - pixel_x = -3; - pixel_y = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitered" - }, -/area/security/brig) "apm" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -6498,27 +6403,12 @@ icon_state = "red" }, /area/security/brig) -"apQ" = ( -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/brig) "apR" = ( /obj/machinery/prize_counter, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness{ name = "\improper Arcade" }) -"apS" = ( -/obj/machinery/portable_atmospherics/canister/sleeping_agent, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "apT" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -6578,11 +6468,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"aqa" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "aqc" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -6638,15 +6523,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/disposal) -"aql" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/brig) "aqq" = ( /obj/machinery/conveyor/west{ id = "garbage" @@ -6780,23 +6656,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"aqE" = ( -/obj/machinery/door/airlock/security/glass{ - name = "N2O Storage"; - req_access_txt = "3" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) -"aqF" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/security/brig) "aqI" = ( /obj/structure/table, /obj/machinery/firealarm{ @@ -7092,27 +6951,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"ari" = ( -/obj/structure/bed, -/obj/machinery/iv_drip, -/obj/item/bedsheet/medical, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/brig) -"arj" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start{ - name = "Brig Physician" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "arl" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -7264,16 +7102,6 @@ /area/maintenance/fpmaint2{ name = "Port Maintenance" }) -"arM" = ( -/obj/machinery/door/window/westleft{ - dir = 4; - name = "Infirmary" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/brig) "arO" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8; @@ -7293,11 +7121,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -7563,20 +7386,6 @@ icon_state = "red" }, /area/security/main) -"asq" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/obj/item/reagent_containers/glass/bottle/charcoal, -/obj/item/reagent_containers/syringe, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitered" - }, -/area/security/brig) "asr" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -7803,23 +7612,6 @@ }, /turf/simulated/floor/plasteel, /area/storage/primary) -"asM" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redcorner" - }, -/area/security/brig) "asN" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb2, @@ -7839,24 +7631,6 @@ icon_state = "dark" }, /area/engine/gravitygenerator) -"asR" = ( -/obj/machinery/door/window/westleft{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitered" - }, -/area/security/brig) "asS" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable/yellow{ @@ -8082,15 +7856,6 @@ icon_state = "redcorner" }, /area/security/brig) -"ats" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/security/brig) "atu" = ( /obj/structure/table, /obj/item/storage/box/cups, @@ -8256,14 +8021,6 @@ icon_state = "showroomfloor" }, /area/security/brig) -"atM" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "atN" = ( /obj/structure/closet/lasertag/red, /turf/simulated/floor/plasteel{ @@ -9431,26 +9188,6 @@ /area/crew_quarters/fitness{ name = "\improper Recreation Area" }) -"awr" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/roller, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitered" - }, -/area/security/brig) "aws" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -10825,10 +10562,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitered" - }, +/turf/simulated/floor/plating, /area/security/brig) "azd" = ( /turf/simulated/floor/plasteel{ @@ -12571,9 +12305,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "whitered" - }, +/turf/simulated/floor/plating, /area/security/brig) "aCU" = ( /obj/machinery/light/small{ @@ -29171,13 +28903,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /mob/living/simple_animal/lizard{ name = "Wags-His-Tail"; real_name = "Wags-His-Tail" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -35192,13 +34924,13 @@ /area/hallway/primary/port) "bye" = ( /obj/structure/bed/dogbed/ian, -/mob/living/simple_animal/pet/dog/corgi/Ian, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); pixel_y = 30 }, +/mob/living/simple_animal/pet/dog/corgi/Ian, /turf/simulated/floor/wood, /area/crew_quarters/heads) "byf" = ( @@ -39831,13 +39563,13 @@ }) "bHC" = ( /obj/machinery/light, -/mob/living/simple_animal/pet/dog/fox/Renault, /obj/machinery/computer/security/telescreen{ dir = 1; name = "MiniSat Monitor"; network = list("MiniSat","tcomm"); pixel_y = -29 }, +/mob/living/simple_animal/pet/dog/fox/Renault, /turf/simulated/floor/carpet, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -76223,12 +75955,6 @@ /area/hallway/secondary/entry{ name = "Arrivals" }) -"eTd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "eUz" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -77832,6 +77558,20 @@ icon_state = "bar" }, /area/crew_quarters/bar) +"jJV" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/security/brig) "jKJ" = ( /obj/structure/chair{ dir = 1 @@ -81001,12 +80741,6 @@ }, /turf/simulated/floor/wood, /area/library) -"tOU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/brig) "tPc" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -104980,9 +104714,9 @@ aaa aaa aaa abq -akD -akD -akD +aaa +aaa +ajg aqu arW ake @@ -105237,9 +104971,9 @@ aaa aaa abq abq -akD -apS -aqF +abq +abq +ajg arP dhI aIg @@ -105494,9 +105228,9 @@ abq abq abq aaa -akD -apS -aqE +aaa +aaa +ajg arH apO aqw @@ -105748,11 +105482,11 @@ abB abq abq abq -amx -amx -amx -amx -amx +aaa +aaa +aaa +aaa +aaa amx aum amx @@ -106005,12 +105739,12 @@ abB abq aaa abq +aaa +aaa +aaa +aaa +aaa amx -aoM -apQ -ari -asq -ajr azc amx auL @@ -106262,12 +105996,12 @@ abB abq aaa abq +aaa +aaa +aaa +aaa +aaa amx -aoW -aqa -arj -aqa -aqa aCT amx amx @@ -106519,14 +106253,14 @@ abB abq abq abq +aaa +aaa +aaa +aaa +aaa +amx +azc amx -anS -tOU -eTd -apj -atM -awr -akD auM awi axG @@ -106777,13 +106511,13 @@ amx amx amx amx -apl -aql -arM -asR -aql +amx +amx +amx +amx +amx aor -akD +amx auN awj aIC @@ -107031,13 +106765,13 @@ ajT akG akR alN -vLL +jJV vLL vLL hRw vLL vLL -asM +vLL vLL aws auh @@ -107294,7 +107028,7 @@ qiC apm qiC qiC -ats +qiC qiC awt ayR diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index d8a42cd4eef..8d44a67eb54 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -573,6 +573,14 @@ "adx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/security/range) "adB" = ( @@ -588,10 +596,8 @@ /turf/space, /area/space) "adD" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/security/range) @@ -601,34 +607,20 @@ pixel_y = -24 }, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, /area/security/range) -"adF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/security/range) "adG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -723,20 +715,12 @@ name = "Firing Range"; req_access_txt = "1" }, -/turf/simulated/floor/plasteel, -/area/security/range) -"adR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Firing Range"; - req_access_txt = "1" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/security/range) "adX" = ( @@ -834,15 +818,20 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/security/medbay) +/area/security/brig) "aeg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/security/medbay) +/area/security/brig) "aeh" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -860,7 +849,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/security/medbay) +/area/security/brig) "aei" = ( /obj/structure/cable{ d1 = 1; @@ -913,21 +902,22 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "rampbottom" }, /area/security/main) "ael" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/vending/secdrobe, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom" + dir = 5; + icon_state = "red" }, /area/security/main) "aem" = ( @@ -950,38 +940,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"aep" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whiteblue" - }, -/area/security/medbay) -"aeq" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whiteblue" - }, -/area/security/medbay) -"aer" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/security/medbay) "aeu" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -1025,24 +983,45 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/main) "aeA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/security/main) "aeB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/decal/warning_stripes/red/partial, /turf/simulated/floor/plasteel, /area/security/main) "aeC" = ( @@ -1099,96 +1078,6 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"aeJ" = ( -/obj/structure/table/glass, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/adv, -/obj/item/reagent_containers/syringe/charcoal, -/obj/item/reagent_containers/glass/bottle/epinephrine, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whiteblue" - }, -/area/security/medbay) -"aeK" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/security/medbay) -"aeL" = ( -/obj/structure/table/glass, -/obj/item/clothing/glasses/hud/health, -/obj/machinery/camera{ - c_tag = "Brig Medbay" - }, -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 30 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/security/medbay) -"aeM" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/security/medbay) -"aeN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/security/medbay) -"aeO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/structure/table/glass, -/obj/item/clothing/accessory/stethoscope, -/obj/item/storage/belt/medical, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whiteblue" - }, -/area/security/medbay) "aeR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -1210,20 +1099,6 @@ icon_state = "dark" }, /area/security/securearmoury) -"aeT" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/sink{ - pixel_y = 25 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/security/medbay) "aeU" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light{ @@ -1349,21 +1224,6 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"afd" = ( -/obj/structure/table/glass, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/computer/med_data/laptop, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/security/medbay) "afe" = ( /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -1377,35 +1237,6 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"afh" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/security/medbay) -"afi" = ( -/obj/machinery/sleeper, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = 28 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/security/medbay) -"afj" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/security/medbay) "afk" = ( /obj/structure/cable{ d2 = 4; @@ -1478,68 +1309,6 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) -"afq" = ( -/obj/structure/table/glass, -/obj/item/storage/box/masks{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/storage/box/gloves, -/obj/item/radio/intercom/department/security{ - pixel_x = -28 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whiteblue" - }, -/area/security/medbay) -"afr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" - }, -/area/security/medbay) -"afs" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" - }, -/area/security/medbay) -"aft" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/security/medbay) -"afu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/security/medbay) -"afv" = ( -/obj/structure/closet/secure_closet/brigdoc, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whiteblue" - }, -/area/security/medbay) -"afw" = ( -/obj/structure/bed/roller, -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" - }, -/area/security/medbay) "afx" = ( /obj/machinery/light_switch{ dir = 1; @@ -1624,42 +1393,10 @@ icon_state = "dark" }, /area/security/brig) -"afW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Brig Medical Bay"; - req_one_access_txt = "63" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" - }, -/area/security/medbay) "afX" = ( /obj/structure/grille, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"afY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = null; - name = "Brig Medical Bay"; - req_one_access_txt = "63" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whiteblue" - }, -/area/security/medbay) "agd" = ( /obj/docking_port/stationary{ dir = 2; @@ -1671,19 +1408,6 @@ }, /turf/space, /area/space) -"agj" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/security/medbay) "agk" = ( /obj/structure/cable{ d1 = 1; @@ -1778,13 +1502,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"ags" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "agt" = ( /turf/simulated/wall/r_wall, /area/security/armoury) @@ -1792,18 +1509,6 @@ /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/security/securearmoury) -"agv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredcorners" - }, -/area/security/brig) "agy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2071,13 +1776,6 @@ }, /turf/simulated/floor/carpet, /area/security/hos) -"ahu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/security/medbay) "ahC" = ( /obj/structure/cable{ d1 = 1; @@ -2145,14 +1843,6 @@ icon_state = "red" }, /area/security/armoury) -"ahI" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "white" - }, -/area/security/medbay) "ahQ" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -2314,16 +2004,6 @@ "aih" = ( /turf/simulated/wall/r_wall, /area/security/hos) -"aii" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "aij" = ( /obj/item/grenade/barrier, /obj/structure/window/reinforced{ @@ -2423,20 +2103,6 @@ icon_state = "dark" }, /area/security/securearmoury) -"ais" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "ait" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -2994,50 +2660,25 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4" + icon_state = "1-4"; + tag = "90Curve" }, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, /area/security/brig) "ajP" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" - }, -/area/security/brig) -"ajQ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, /area/security/brig) "ajR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3048,19 +2689,11 @@ }, /area/security/brig) "ajS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -3070,9 +2703,6 @@ /obj/structure/sign/poster/official/random{ pixel_y = -32 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3097,25 +2727,6 @@ "ajV" = ( /turf/simulated/floor/carpet, /area/security/hos) -"ajW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredcorners" - }, -/area/security/brig) "ajX" = ( /obj/structure/cable{ d1 = 4; @@ -3127,9 +2738,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -3145,9 +2753,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -3160,9 +2765,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -3617,9 +3219,6 @@ /turf/simulated/wall/r_wall, /area/security/prisonlockers) "ala" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -3649,12 +3248,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j2s"; - name = "Brig Physician"; - sortType = 24 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -4242,15 +3836,12 @@ /turf/simulated/floor/plating, /area/maintenance/fore) "amf" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/item/radio/intercom{ pixel_y = 28 }, -/obj/machinery/vending/secdrobe, +/obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ - dir = 5; + dir = 1; icon_state = "red" }, /area/security/main) @@ -5262,14 +4853,6 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonlockers) -"aoi" = ( -/obj/effect/landmark/start{ - name = "Brig Physician" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/security/medbay) "aok" = ( /obj/structure/table, /obj/item/book/manual/security_space_law, @@ -6051,9 +5634,6 @@ icon_state = "red" }, /area/security/seceqstorage) -"apF" = ( -/turf/simulated/wall/r_wall, -/area/security/medbay) "apG" = ( /obj/machinery/light/small{ dir = 4 @@ -82203,6 +81783,14 @@ /obj/machinery/meter, /turf/simulated/floor/engine, /area/engine/engineering) +"smQ" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/security/brig) "sud" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/unary/portables_connector{ @@ -82344,6 +81932,19 @@ icon_state = "dark" }, /area/engine/engineering) +"tDv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "floorgrime" + }, +/area/security/range) "tDB" = ( /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plating, @@ -108103,11 +107704,11 @@ awB ada adt awB -aab -apF -aeJ -afd -afq +aaa +aaa +aaa +aaa +aaa aef aqX aie @@ -108360,11 +107961,11 @@ ahF ahF ahF ahF -apF -apF -aeL -aoi -afs +aaa +aaa +aaa +aaa +aaa aeh agr aig @@ -108617,13 +108218,13 @@ ahF ahF ahF ahF -aef -aep -aeK -ahu -afr +aaa +aaa +aaa +aaa +aaa aeg -aqW +aqX aie ajM alc @@ -108874,15 +108475,15 @@ ahF ahF ahF ahF -aeh -aer -aeN -afh -afu -afY -agv -ais -ajQ +aaa +aaa +aaa +aaa +aaa +aeg +aqX +aie +ajM alc aoe aMO @@ -109131,14 +108732,14 @@ ahF ahF ahF ahF +aaa +aaa +aaa +aaa +aaa aeg -aeq -aeM -ahI -aft -afW -ags -aii +aqX +aie ajP aIo aod @@ -109388,14 +108989,14 @@ ahF ahF ahF ahF -apF -apF -aeT -afj -afw -agj -agr -aig +aaa +aaa +aaa +aaa +aaa +aeg +aqX +aie ajS alr aog @@ -109645,12 +109246,12 @@ ahF ahF ahF ahF -aab -apF -aeO -afi -afv -aeg +aaa +aaa +aaa +aaa +aaa +smQ aqX aie ajR @@ -110424,7 +110025,7 @@ apg alU aqX ase -ajW +atE alK aom arl @@ -110681,7 +110282,7 @@ apf aqw aqX ase -ajW +atE alK anX ark @@ -114269,7 +113870,7 @@ act aqd acM adj -acg +tDv anA aej aez @@ -115297,8 +114898,8 @@ acv acg acP adm -adF -adR +aqd +akW ael aeB anO diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 76fe78e581a..2af1016b309 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -59,7 +59,7 @@ #define JOB_NANO (1<<0) #define JOB_BLUESHIELD (1<<1) #define JOB_BARBER (1<<3) -// #define JOB_MECHANIC (1<<4) // AA07 2021-10-02 - Removed: Kept for history sake -#define JOB_BRIGDOC (1<<5) +// #define JOB_MECHANIC (1<<4) // AA07 2021-10-02 - Removed: Kept for history sake +// #define JOB_BRIGDOC (1<<5) // AA07 2021-12-01 - Removed: Kept for history sake // #define JOB_JUDGE (1<<6) // AA07 2021-10-09 - Moved to ENGSEC (Non karma): Define kept for history sake // #define JOB_PILOT (1<<7) // AA07 2021-10-02 - Removed: Kept for history sake diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 0aa01605808..c92415d6a4a 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -641,7 +641,7 @@ GLOBAL_LIST_INIT(do_after_once_tracker, list()) * where active is defined as conscious (STAT = 0) and not an antag */ /proc/check_active_security_force() - var/sec_positions = GLOB.security_positions - "Magistrate" - "Brig Physician" + var/sec_positions = GLOB.security_positions - "Magistrate" var/total = 0 var/active = 0 var/dead = 0 diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index ad0f11f97f1..e23fe8550a3 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals", "Atmospherics", "HoS Office", "Security", "Medbay", "CMO Office", "Chemistry", "Research", "RD Office", "Robotics", "HoP Office", "Library", "Chapel", "Captain's Office", - "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics","Brig Physician")) + "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics")) GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 7104deef923..56cbe59354d 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -461,10 +461,6 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) - if("Brig Physician") - clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s") - clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) if("Security Officer") clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 4899ae47dce..26a7144585a 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -1451,10 +1451,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "sec_prison_lockers" can_get_auto_cryod = FALSE -/area/security/medbay - name = "\improper Security Medbay" - icon_state = "security_medbay" - /area/security/prisonershuttle name = "\improper Security Prisoner Shuttle" icon_state = "security" diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index adff8634c03..3a9b3865275 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E name = "changeling" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 96d8c7fff30..90d0a0561ae 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/cult name = "cult" config_tag = "cult" - restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") + restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") protected_jobs = list() required_players = 30 required_enemies = 3 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index eec522f577e..c16eb8d49da 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -13,7 +13,7 @@ /datum/game_mode/revolution name = "revolution" config_tag = "revolution" - restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician") + restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate") required_players = 20 required_enemies = 1 recommended_enemies = 3 diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index b9a4eaf38a7..63e0b668704 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -74,7 +74,7 @@ Made by Xhuis required_enemies = 2 recommended_enemies = 2 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") /datum/game_mode/shadowling/announce() to_chat(world, "The current game mode is - Shadowling!") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 2f79ad30a7e..fa77a65a0a8 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -8,7 +8,7 @@ name = "traitor" config_tag = "traitor" restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index 1a5a68d3a5e..ea42cf54720 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -2,7 +2,7 @@ name = "traitor+vampire" config_tag = "traitorvamp" traitors_possible = 3 //hard limit on traitors if scaling is turned off - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General") restricted_jobs = list("Cyborg") secondary_restricted_jobs = list("AI") required_players = 10 diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index cedecd52646..695a7a4853e 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -7,7 +7,7 @@ name = "vampire" config_tag = "vampire" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index ca3c7f379f0..548cdf9b149 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -190,35 +190,3 @@ satchel = /obj/item/storage/backpack/satchel_sec dufflebag = /obj/item/storage/backpack/duffel/security - - -/datum/job/brigdoc - title = "Brig Physician" - flag = JOB_BRIGDOC - department_flag = JOBCAT_KARMA - total_positions = 1 - spawn_positions = 1 - is_security = 1 - supervisors = "the head of security" - department_head = list("Head of Security") - selection_color = "#ffeeee" - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS) - outfit = /datum/outfit/job/brigdoc - -/datum/outfit/job/brigdoc - name = "Brig Physician" - jobtype = /datum/job/brigdoc - uniform = /obj/item/clothing/under/rank/security/brigphys - suit = /obj/item/clothing/suit/storage/fr_jacket - shoes = /obj/item/clothing/shoes/white - l_ear = /obj/item/radio/headset/headset_sec/alt/brig_phys - glasses = /obj/item/clothing/glasses/hud/health/sunglasses - id = /obj/item/card/id/security - suit_store = /obj/item/flashlight/pen - l_hand = /obj/item/storage/firstaid/doctor - pda = /obj/item/pda/medical - implants = list(/obj/item/implant/mindshield) - backpack = /obj/item/storage/backpack/medic - satchel = /obj/item/storage/backpack/satchel_med - dufflebag = /obj/item/storage/backpack/duffel/medical diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index d26872bacd0..2b0d6e783f7 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -73,7 +73,6 @@ GLOBAL_LIST_INIT(security_positions, list( "Warden", "Detective", "Security Officer", - "Brig Physician", "Magistrate" )) @@ -93,7 +92,6 @@ GLOBAL_LIST_INIT(whitelisted_positions, list( "Blueshield", "Nanotrasen Representative", "Barber", - "Brig Physician" )) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 407d1de2405..474385397a9 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -48,7 +48,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /datum/job/judge, /datum/job/blueshield, /datum/job/nanotrasenrep, - /datum/job/brigdoc, /datum/job/barber, /datum/job/chaplain ) diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 53633cd1b23..f13a6586710 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -79,7 +79,6 @@ "Xenoarcheologist" = "sciradio", "Xenobiologist" = "sciradio", // Security - "Brig Physician" = "secradio", "Detective" = "secradio", "Forensic Technician" = "secradio", "Head of Security" = "secradio", diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 3f380ce9341..1803f568c98 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -128,10 +128,6 @@ icon_state = "sec_headset_alt" item_state = "sec_headset_alt" -/obj/item/radio/headset/headset_sec/alt/brig_phys - name = "brig physician bowman headset" - ks1type = /obj/item/encryptionkey/headset_med - /obj/item/radio/headset/headset_iaa name = "internal affairs radio headset" desc = "This is used by your elite legal team." diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index eca736152f9..91bc6174318 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -72,7 +72,7 @@ qdel(src) return if(istype(W, /obj/item/pen)) - var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Brig Physician", "Captain", + var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Captain", "Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Assistant", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP", "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 9fadc23f378..65adaf1940c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -164,32 +164,6 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/suit/armor/secjacket(src) - -/obj/structure/closet/secure_closet/brigdoc - name = "brig physician's locker" - req_access = list(ACCESS_SECURITY) - icon_state = "med" - open_door_sprite = "med_door" - -/obj/structure/closet/secure_closet/brigdoc/populate_contents() - if(prob(50)) - new /obj/item/storage/backpack/medic(src) - else - new /obj/item/storage/backpack/satchel_med(src) - new /obj/item/reagent_containers/spray/pepper(src) - new /obj/item/flash(src) - new /obj/item/storage/firstaid/regular(src) - new /obj/item/storage/firstaid/fire(src) - new /obj/item/storage/firstaid/adv(src) - new /obj/item/storage/firstaid/o2(src) - new /obj/item/storage/firstaid/toxin(src) - new /obj/item/clothing/suit/storage/brigdoc(src) - new /obj/item/clothing/under/rank/security/brigphys(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/radio/headset/headset_sec/alt/brig_phys(src) - new /obj/item/clothing/shoes/sandal/white(src) - - /obj/structure/closet/secure_closet/blueshield name = "blueshield's locker" req_access = list(ACCESS_BLUESHIELD) diff --git a/code/modules/arcade/mob_hunt/mob_type_datums.dm b/code/modules/arcade/mob_hunt/mob_type_datums.dm index 9d94b5f51f6..024a9173b55 100644 --- a/code/modules/arcade/mob_hunt/mob_type_datums.dm +++ b/code/modules/arcade/mob_hunt/mob_type_datums.dm @@ -128,7 +128,6 @@ TYPE_POISON, TYPE_FIGHTING) area_blacklist = list(/area/medical, - /area/security/medbay, /area/janitor) area_whitelist = list(/area/medical/virology, /area/toxins, diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 84b951691c6..cd050378c37 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1423,19 +1423,20 @@ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) - else if(job_karma_high) - switch(job_karma_high) - if(JOB_BRIGDOC) - clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) + if(JOB_JUDGE) + clothes_s = new /icon(uniform_dmi, "really_black_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) + else if(job_karma_high) + switch(job_karma_high) if(JOB_NANO) clothes_s = new /icon(uniform_dmi, "officer_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) @@ -1458,18 +1459,6 @@ clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) - if(JOB_JUDGE) - clothes_s = new /icon(uniform_dmi, "really_black_suit_s") - clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY) - switch(backbag) - if(2) - clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) - if(3) - clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) - if(4) - clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(disabilities & DISABILITY_FLAG_NEARSIGHTED) preview_icon.Blend(new /icon('icons/mob/clothing/eyes.dmi', "glasses"), ICON_OVERLAY) diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index ba5e8626a0e..1c74a721b92 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -105,7 +105,7 @@ /datum/gear/accessory/stethoscope display_name = "Stethoscope" path = /obj/item/clothing/accessory/stethoscope - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic") /datum/gear/accessory/cowboyshirt display_name = "Cowboy shirt, black" @@ -182,7 +182,7 @@ /datum/gear/accessory/armband_job/sec display_name = "Armband, security" path = /obj/item/clothing/accessory/armband/sec - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician") + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") /datum/gear/accessory/armband_job/cargo display_name = "Armband, cargo" @@ -192,12 +192,12 @@ /datum/gear/accessory/armband_job/medical display_name = "Armband, medical" path = /obj/item/clothing/accessory/armband/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic", "Brig Physician") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic") /datum/gear/accessory/armband_job/emt display_name = "Armband, EMT" path = /obj/item/clothing/accessory/armband/medgreen - allowed_roles = list("Paramedic", "Brig Physician") + allowed_roles = list("Paramedic") /datum/gear/accessory/armband_job/engineering display_name = "Armband, engineering" diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index ee8555d6d85..5b517b5035b 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -203,7 +203,7 @@ /datum/gear/mug/department/sec display_name = "Coffee mug, security" description = "An officer's coffee mug, emblazoned in the colors of the Security department." - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Internal Affairs Agent") + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Internal Affairs Agent") path = /obj/item/reagent_containers/food/drinks/mug/sec /datum/gear/mug/department/serv diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index f6aa86060f2..ea9836775e7 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -166,7 +166,7 @@ /datum/gear/hat/beret_job/med display_name = "Beret, medical" path = /obj/item/clothing/head/beret/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Brig Physician" , "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Coroner") /datum/gear/hat/beret_job/eng display_name = "Beret, engineering" diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index e9e95bc54ae..ef1a4ecb035 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -33,7 +33,7 @@ display_name = "Lightweight veil" description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races. This one has an in-built medical HUD." path = /obj/item/clothing/glasses/hud/health/tajblind - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") cost = 2 /datum/gear/racial/taj/sci diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 4f9298c6ac9..d87d5a323e4 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -41,7 +41,7 @@ /datum/gear/suit/coat/job/med display_name = "Winter coat, medical" path = /obj/item/clothing/suit/hooded/wintercoat/medical - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician" , "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") /datum/gear/suit/coat/job/sci display_name = "Winter coat, science" diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 30d912aedc1..1c66451b419 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -173,11 +173,6 @@ path = /obj/item/clothing/under/rank/medical/skirt allowed_roles = list("Chief Medical Officer","Medical Doctor","Psychiatrist","Paramedic","Coroner") -/datum/gear/uniform/skirt/job/phys - display_name = "Skirt, physician" - path = /obj/item/clothing/under/rank/security/brigphys/skirt - allowed_roles = list("Brig Physician") - /datum/gear/uniform/skirt/job/sci display_name = "Skirt, scientist" path = /obj/item/clothing/under/rank/scientist/skirt diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index fc152b9e45c..9fb8a437eba 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -15,21 +15,6 @@ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) -//Brig Physician -/obj/item/clothing/suit/storage/brigdoc - name = "brig physician's vest" - desc = "A vest often worn by doctors caring for inmates." - icon_state = "brigphysician-vest" - item_state = "brigphysician-vest" - allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe, - /obj/item/healthanalyzer, /obj/item/flashlight, \ - /obj/item/radio, /obj/item/tank/internals/emergency_oxygen,/obj/item/rad_laser) - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50) - - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) - //Botanist /obj/item/clothing/suit/apron name = "apron" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index af48c5814ca..2bfb647c287 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -165,21 +165,3 @@ item_state = "gy_suit" item_color = "hos_formal" - -//Brig Physician -/obj/item/clothing/under/rank/security/brigphys - name = "brig physician's jumpsuit" - desc = "Jumpsuit for Brig Physician it has both medical and security protection." - icon_state = "brig_phys" - item_state = "brig_phys" - item_color = "brig_phys" - permeability_coefficient = 0.50 - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 30, acid = 30) - -/obj/item/clothing/under/rank/security/brigphys/skirt - name = "brig physician's jumpskirt" - desc = "A skirted Brig Physician uniform. It has both security and medical protection." - icon_state = "brig_physf" - item_state = "brig_physf" - item_color = "brig_physf" - permeability_coefficient = 0.50 diff --git a/code/modules/karma/karma_holder.dm b/code/modules/karma/karma_holder.dm index 8e74af84373..16427312cf2 100644 --- a/code/modules/karma/karma_holder.dm +++ b/code/modules/karma/karma_holder.dm @@ -38,10 +38,6 @@ dat += "Unlock Barber -- 5KP
" else dat += "Barber - Unlocked
" - if(!("Brig Physician" in unlocked_jobs)) - dat += "Unlock Brig Physician -- 5KP
" - else - dat += "Brig Physician - Unlocked
" if(!("Nanotrasen Representative" in unlocked_jobs)) dat += "Unlock Nanotrasen Representative -- 30KP
" else @@ -124,6 +120,9 @@ if("Magistrate" in purchased) refundable += "Magistrate" dat += "Refund Magistrate -- 45KP
" + if("Brig Physician" in purchased) + refundable += "Brig Physician" + dat += "Refund Brig Physician -- 5KP
" if(!length(refundable)) dat += "You do not have any refundable karma purchases.
" @@ -313,6 +312,8 @@ cost = 10 if("Magistrate") cost = 45 + if("Brig Physician") + cost = 5 else to_chat(usr, "That job is not refundable.") return @@ -390,8 +391,6 @@ switch(href_list["KarmaBuy"]) if("1") karma_purchase(5, "job", "Barber") - if("2") - karma_purchase(5, "job", "Brig Physician") if("3") karma_purchase(30, "job", "Nanotrasen Representative") if("4") diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index eddb6b67f2b..6ce6a5ed6af 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -87,7 +87,7 @@ if("Shaft Miner") O = new /datum/outfit/plasmaman/mining - if("Medical Doctor", "Brig Physician", "Paramedic", "Coroner") + if("Medical Doctor", "Paramedic", "Coroner") O = new /datum/outfit/plasmaman/medical if("Chief Medical Officer") diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 0430cb40cfb..18e3c87a91f 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -77,7 +77,6 @@ /datum/job/judge, /datum/job/blueshield, /datum/job/nanotrasenrep, - /datum/job/brigdoc, /datum/job/barber, /datum/job/chaplain, /datum/job/ntnavyofficer, diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index 9abb46b3861..c6b486c7075 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -376,7 +376,7 @@ /datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE - if(ishuman(M) && (M.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Brig Physician", "Internal Affairs Agent", "Magistrate"))) + if(ishuman(M) && (M.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Internal Affairs Agent", "Magistrate"))) update_flags |= M.adjustBruteLoss(-1, FALSE) update_flags |= M.adjustFireLoss(-1, FALSE) return ..() | update_flags diff --git a/config/example/config.toml b/config/example/config.toml index 56089864d4f..49a07e4f893 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -452,7 +452,7 @@ job_slot_amounts = [ {name = "Scientist", lowpop = 6, highpop = 7}, # Security {name = "Detective", lowpop = 1, highpop = 1}, - {name = "Security Officer", lowpop = 7, highpop = 8}, + {name = "Security Officer", lowpop = 8, highpop = 9}, {name = "Warden", lowpop = 1, highpop = 1}, # Service {name = "Bartender", lowpop = 1, highpop = 1},