cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1582 from FireFishie/hat2

Browse Source 
Captain's cap is now a hat
This commit is contained in:
CIB
2012-08-06 12:52:04 -07:00
parent 2270fdf051 9b4cdb357e
commit fafe55632b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/SkyMarshal/wardrobes.dm
View File

@@ -208,7 +208,7 @@
new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/suit/storage/captunic(src) new /obj/item/clothing/suit/storage/captunic(src)
new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/cap(src) new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/gloves/captain(src) new /obj/item/clothing/gloves/captain(src)
new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/head/helmet/swat(src)
new /obj/item/device/radio/headset/heads/captain(src) new /obj/item/device/radio/headset/heads/captain(src)

2
code/game/jobs/job/captain.dm
View File

@@ -19,7 +19,7 @@
H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform)
H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt) H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt)
H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
H.equip_if_possible(new /obj/item/clothing/head/helmet/cap(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head)
H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses) H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
H.equip_if_possible(new /obj/item/clothing/gloves/captain(H), H.slot_gloves) H.equip_if_possible(new /obj/item/clothing/gloves/captain(H), H.slot_gloves)
if(H.backbag == 1) if(H.backbag == 1)

2
code/game/objects/closets/secure/security.dm
View File

@@ -16,7 +16,7 @@
new /obj/item/device/pda/captain(src) new /obj/item/device/pda/captain(src)
new /obj/item/weapon/storage/id_kit(src) new /obj/item/weapon/storage/id_kit(src)
new /obj/item/clothing/suit/armor/captain(src) new /obj/item/clothing/suit/armor/captain(src)
new /obj/item/clothing/head/caphat(src) new /obj/item/clothing/head/helmet/cap(src)
new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/weapon/cartridge/captain(src) new /obj/item/weapon/cartridge/captain(src)