Skip to content

Commit

Permalink
-Added Captain's Backpack & Satchel: https://dl.dropbox.com/u/831776/…
Browse files Browse the repository at this point in the history
…comdoms.png

-A few minor improvements to my own sprites

-Map changes to the Kitchen so the chef is more visible to his patrons
-Arrivals airlocks are no longer airless when shuttles dock

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4094 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
ericgfwong@hotmail.com committed Jul 17, 2012
1 parent d96e6a0 commit 0f5b2f5
Show file tree
Hide file tree
Showing 10 changed files with 7,479 additions and 7,468 deletions.
10 changes: 9 additions & 1 deletion code/defines/obj/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
desc = "It's a very robust backpack."
icon_state = "securitypack"

/obj/item/weapon/storage/backpack/captain
name = "Captain's Backpack"
desc = "It's a special backpack made exclusively for Nanotrasen officers."
icon_state = "captainpack"

/obj/item/weapon/storage/backpack/satchel
name = "satchel"
desc = "It's a very robust satchel to wear on your back."
Expand Down Expand Up @@ -166,7 +171,10 @@
desc = "A green satchel for plant related work."
icon_state = "satchel_hyd"


/obj/item/weapon/storage/backpack/satchel_cap
name = "Captain's Satchel"
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"

/obj/item/weapon/storage/backpack/bandolier
name = "bandolier"
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears)
if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back)
if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/captain(H), H.slot_back)
if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_cap(H), H.slot_back)
H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack)
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)
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/closets/secure/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
New()
..()
sleep(2)
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
else
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/head/helmet/cap(src)
new /obj/item/clothing/under/rank/captain(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
flags_inv = HIDEEARS

/obj/item/clothing/head/soft/sec
name = "soft cap"
name = "security cap"
desc = "It's baseball hat in tasteful red colour."
icon_state = "secsoft"
color = "sec"
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/human_face.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.
14,927 changes: 7,463 additions & 7,464 deletions maps/tgstation.2.0.9.dmm

Large diffs are not rendered by default.

0 comments on commit 0f5b2f5

Please sign in to comment.