diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 470e24beb65..b8e7c1d35a9 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -3529,7 +3529,6 @@ pixel_x = 32 }, /obj/structure/closet/secure_closet/hos, -/obj/item/reagent_containers/food/drinks/flask/barflask, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -10155,18 +10154,6 @@ /turf/space, /area/space/nearstation) "axp" = ( -/obj/structure/bookcase, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science{ - pixel_y = -14 - }, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/obj/item/book/manual/sop_general, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_command, /obj/machinery/requests_console{ department = "Internal Affairs Office"; name = "Internal Affairs Requests Console"; @@ -10175,6 +10162,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/bookcase/sop, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -11888,21 +11876,6 @@ }, /area/lawoffice) "aAE" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/storage/briefcase{ - pixel_x = -2; - pixel_y = -5 - }, -/obj/item/storage/briefcase{ - pixel_x = 3 - }, -/obj/item/storage/secure/briefcase{ - pixel_x = 5; - pixel_y = -5 - }, /obj/machinery/light{ dir = 8 }, @@ -11913,6 +11886,7 @@ dir = 1; pixel_y = -24 }, +/obj/structure/closet/secure_closet/iaa, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -50173,16 +50147,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/bookcase, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/obj/item/book/manual/sop_general, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_command, +/obj/structure/bookcase/sop, /turf/simulated/floor/wood, /area/ntrep) "ccM" = ( @@ -52498,8 +52463,6 @@ /area/medical/cmo) "chA" = ( /obj/structure/closet/secure_closet/CMO, -/obj/item/clothing/mask/gas, -/obj/item/storage/briefcase, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -60283,9 +60246,6 @@ /area/medical/virology) "cvR" = ( /obj/structure/closet/secure_closet/psychiatrist, -/obj/item/clipboard{ - pixel_x = -5 - }, /obj/machinery/door_control{ id = "psychoffice"; name = "Privacy Shutters Control"; diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 46ed46f5ae2..0d9e7fba744 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -263,7 +263,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca uniform = /obj/item/clothing/under/rank/internalaffairs suit = /obj/item/clothing/suit/storage/internalaffairs shoes = /obj/item/clothing/shoes/brown - l_ear = /obj/item/radio/headset/headset_iaa + l_ear = /obj/item/radio/headset/headset_iaa/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only id = /obj/item/card/id/security l_pocket = /obj/item/laser_pointer diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 03d89af52af..3f380ce9341 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -133,12 +133,18 @@ 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." + icon_state = "sec_headset" + item_state = "sec_headset" + ks2type = /obj/item/encryptionkey/headset_iaa + +/obj/item/radio/headset/headset_iaa/alt name = "internal affairs bowman headset" desc = "This is used by your elite legal team. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "sec_headset_alt" item_state = "sec_headset_alt" - ks2type = /obj/item/encryptionkey/headset_iaa /obj/item/radio/headset/headset_eng name = "engineering radio headset" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 25c6572b9a8..37594cd5c31 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -109,8 +109,6 @@ icon_closed = "blue" /obj/structure/closet/lawcloset/populate_contents() - new /obj/item/storage/box/tapes(src) - new /obj/item/book/manual/faxes(src) new /obj/item/clothing/under/lawyer/female(src) new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/red(src) @@ -120,10 +118,6 @@ new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/glasses/sunglasses/big(src) - new /obj/item/clothing/glasses/sunglasses/big(src) - new /obj/item/clothing/accessory/lawyers_badge(src) - new /obj/item/clothing/accessory/lawyers_badge(src) //Paramedic diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 555124cbb47..e8666930aa8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -138,6 +138,7 @@ new /obj/item/clothing/suit/straight_jacket(src) new /obj/item/reagent_containers/syringe(src) new /obj/item/reagent_containers/glass/bottle/ether(src) + new /obj/item/clipboard(src) new /obj/item/storage/fancy/cigarettes/cigpack_med(src) new /obj/item/storage/fancy/cigarettes/cigpack_med(src) new /obj/item/storage/fancy/cigarettes/cigpack_med(src) @@ -191,6 +192,8 @@ new /obj/item/door_remote/chief_medical_officer(src) new /obj/item/reagent_containers/food/drinks/mug/cmo(src) new /obj/item/clothing/accessory/medal/medical(src) + new /obj/item/storage/briefcase(src) + new /obj/item/clothing/mask/gas(src) /obj/structure/closet/secure_closet/animal 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 57aa92d0d9e..05e7013591d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -126,6 +126,7 @@ new /obj/item/reagent_containers/food/drinks/mug/hos(src) new /obj/item/organ/internal/cyberimp/eyes/hud/security(src) new /obj/item/clothing/accessory/medal/security(src) + new /obj/item/reagent_containers/food/drinks/flask/barflask(src) /obj/structure/closet/secure_closet/warden name = "warden's locker" @@ -449,8 +450,33 @@ new /obj/item/clothing/under/rank/centcom/magistrate(src) new /obj/item/clothing/suit/judgerobe(src) new /obj/item/clothing/head/powdered_wig(src) + new /obj/item/clothing/head/justice_wig(src) + new /obj/item/radio/headset/heads/magistrate(src) new /obj/item/gavelblock(src) new /obj/item/gavelhammer(src) - new /obj/item/clothing/head/justice_wig(src) new /obj/item/clothing/accessory/medal/legal(src) new /obj/item/clothing/accessory/lawyers_badge(src) + +/obj/structure/closet/secure_closet/iaa + name = "internal affairs locker" + req_access = list(ACCESS_LAWYER) + icon_state = "iaasecure1" + icon_closed = "iaasecure" + icon_locked = "iaasecure1" + icon_opened = "iaasecureopen" + icon_broken = "iaasecurebroken" + icon_off = "iaasecureoff" + +/obj/structure/closet/secure_closet/iaa/populate_contents() + new /obj/item/book/manual/faxes(src) + new /obj/item/storage/box/tapes(src) + new /obj/item/storage/secure/briefcase(src) + new /obj/item/storage/briefcase(src) + new /obj/item/storage/briefcase(src) + new /obj/item/radio/headset/headset_iaa(src) + new /obj/item/clothing/under/rank/internalaffairs(src) + new /obj/item/clothing/suit/storage/internalaffairs(src) + new /obj/item/clothing/glasses/sunglasses/big(src) + new /obj/item/clothing/glasses/sunglasses/big(src) + new /obj/item/clothing/accessory/lawyers_badge(src) + new /obj/item/clothing/accessory/lawyers_badge(src) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index e6aa29b0142..6cbc1984020 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -126,6 +126,21 @@ new /obj/item/book/manual/research_and_development(src) update_icon() +/obj/structure/bookcase/sop + name = "bookcase (Standard Operating Procedures)" + +/obj/structure/bookcase/sop/Initialize() + . = ..() + new /obj/item/book/manual/sop_command(src) + new /obj/item/book/manual/sop_engineering(src) + new /obj/item/book/manual/sop_general(src) + new /obj/item/book/manual/sop_legal(src) + new /obj/item/book/manual/sop_medical(src) + new /obj/item/book/manual/sop_science(src) + new /obj/item/book/manual/sop_security(src) + new /obj/item/book/manual/sop_service(src) + new /obj/item/book/manual/sop_supply(src) + update_icon() /* * Book diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 83cde24a8a4..761ccd7b7ee 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ