diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3eeba6668a..9c20f84e7a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -23473,7 +23473,6 @@ /obj/machinery/computer/card{ dir = 8 }, -/obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/captain) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 097aa38fab..70fa1445e6 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -51836,8 +51836,6 @@ /area/crew_quarters/heads/captain/private) "cbf" = ( /obj/structure/closet/secure_closet/captains, -/obj/item/clothing/suit/armor/vest/capcarapace, -/obj/item/clothing/head/caphat, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -52708,7 +52706,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -170621,4 +170618,3 @@ aaa aaa aaa "} - diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e8537b432b..7bcb98e417 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -28954,7 +28954,6 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/item/card/id/captains_spare, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bji" = ( diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index c4f5177e20..340afb89dc 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -3013,7 +3013,6 @@ "aga" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, -/obj/item/card/id/captains_spare, /obj/item/toy/figure/captain, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -71264,9 +71263,9 @@ aZz baq bbl bbY -bcP +bbm bdM -bcP +bbm sKE bfv bfS @@ -71521,9 +71520,9 @@ aZA bar bbm bbZ -bcP -bcP -bcP +bbm +bbm +bbm baj bfu bfu @@ -81807,7 +81806,7 @@ aZl sPI bfP bgm -bhh +bhg bgm sKZ bjd diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 01c32123e6..affc670467 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -9098,7 +9098,6 @@ /area/crew_quarters/heads/captain) "axU" = ( /obj/machinery/computer/card, -/obj/item/card/id/captains_spare, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; 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 2eae2a9fb9..2caa050309 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -6,22 +6,22 @@ /obj/structure/closet/secure_closet/captains/PopulateContents() ..() new /obj/item/clothing/suit/hooded/wintercoat/captain(src) - if(prob(50)) - new /obj/item/storage/backpack/captain(src) - else - new /obj/item/storage/backpack/satchel/cap(src) + new /obj/item/storage/backpack/captain(src) + new /obj/item/storage/backpack/satchel/cap(src) + new /obj/item/storage/backpack/duffelbag/captain(src) new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/clothing/neck/petcollar(src) new /obj/item/pet_carrier(src) - new /obj/item/storage/backpack/duffelbag/captain(src) - new /obj/item/clothing/head/crown/fancy(src) - new /obj/item/clothing/suit/captunic(src) - new /obj/item/clothing/under/captainparade(src) - new /obj/item/clothing/head/caphat/parade(src) - new /obj/item/clothing/under/rank/captain(src) - new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src) - new /obj/item/cartridge/captain(src) new /obj/item/clothing/shoes/sneakers/brown(src) + new /obj/item/clothing/under/rank/captain(src) + new /obj/item/clothing/suit/armor/vest/capcarapace(src) + new /obj/item/clothing/head/caphat(src) + new /obj/item/clothing/under/captainparade(src) + new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src) + new /obj/item/clothing/head/caphat/parade(src) + new /obj/item/clothing/suit/captunic(src) + new /obj/item/clothing/head/crown/fancy(src) + new /obj/item/cartridge/captain(src) new /obj/item/storage/box/silver_ids(src) new /obj/item/device/radio/headset/heads/captain/alt(src) new /obj/item/device/radio/headset/heads/captain(src) @@ -31,6 +31,7 @@ new /obj/item/storage/belt/sabre(src) new /obj/item/gun/energy/e_gun(src) new /obj/item/door_remote/captain(src) + new /obj/item/card/id/captains_spare(src) /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker"