shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Moves the spare ID inside the captain's locker (#5291)

Browse Source 
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
This commit is contained in:
CitadelStationBot
2018-02-05 05:36:09 -06:00
committed by Poojawa
parent 571fd8d1d2
commit 92212cdcb6
6 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
-1
View File
@@ -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)
_maps/map_files/Deltastation/DeltaStation2.dmm
-4
View File
@@ -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
"}
_maps/map_files/MetaStation/MetaStation.dmm
-1
View File
@@ -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" = (
_maps/map_files/OmegaStation/OmegaStation.dmm
+6 -7
View File
@@ -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
_maps/map_files/PubbyStation/PubbyStation.dmm
-1
View File
@@ -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)";
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+13 -12
View File
@@ -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"