Skip to content

Commit

Permalink
Bunny ears, clown+security+medical backpacks, and skirt added.
Browse files Browse the repository at this point in the history
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@803 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
bizarre.babel@gmail.com committed Jan 7, 2011
1 parent 0a89eb1 commit 4fbce68
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 9 deletions.
12 changes: 12 additions & 0 deletions code/defines/obj/clothing/gimmick.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/obj/item/clothing/head/rabbitears
name = "rabbitears"
desc = "The ears from a bunny"
icon_state = "bunny"
flags = FPRINT | TABLEPASS | HEADSPACE

/obj/item/clothing/under/blackskirt
name = "Black skirt"
desc = "A black skirt"
icon_state = "blackskirt"
color = "blackskirt"

/obj/item/clothing/shoes/red
name = "red shoes"
icon_state = "red"
Expand Down
22 changes: 17 additions & 5 deletions code/defines/obj/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,39 @@
flags = 259.0

/obj/item/weapon/storage/pill_bottle
name = "Pill bottle"
name = "pill bottle"
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
can_hold = list("/obj/item/weapon/reagent_containers/pill")

/obj/item/weapon/storage/box
name = "Box"
name = "box"
icon_state = "box"
item_state = "syringe_kit"

/obj/item/weapon/storage/pillbottlebox
name = "Pill Bottles"
name = "pill bottles"
icon_state = "box"
item_state = "syringe_kit"

/obj/item/weapon/storage/blankbox
name = "Blank Shells"
name = "blank shells"
icon_state = "box"
item_state = "syringe_kit"

/obj/item/weapon/storage/backpack/clown
name = "Giggles Von Honkerton"
icon_state = "clownpack"

/obj/item/weapon/storage/backpack/medic
name = "medic's backpack"
icon_state = "medicalpack"

/obj/item/weapon/storage/backpack/security
name = "security backpack"
icon_state = "securitypack"

/obj/item/weapon/storage/briefcase
name = "briefcase"
icon_state = "briefcase"
Expand All @@ -53,7 +65,7 @@
w_class = 4.0

/obj/item/weapon/storage/disk_kit
name = "Data Disks"
name = "data disks"
icon_state = "id"
item_state = "syringe_kit"

Expand Down
16 changes: 12 additions & 4 deletions code/game/jobs/jobprocs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)

if ("Clown")
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
// src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/clown (src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/clown(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
Expand Down Expand Up @@ -354,6 +355,7 @@
if ("Medical Doctor")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
Expand All @@ -375,7 +377,8 @@

if ("Security Officer")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
// src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/color/red(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
Expand All @@ -384,14 +387,15 @@
// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
// src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
// src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
// src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack)
// src.equip_if_possible(new /obj/item/weapon/baton(src), slot_belt)
// src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)

if ("Warden")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
// src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/rank/warden(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
Expand Down Expand Up @@ -420,6 +424,7 @@
src.equip_if_possible(new /obj/item/clothing/suit/armor/hos(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(src), slot_head)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
// src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_belt)
// src.equip_if_possible(new /obj/item/weapon/gun/energy/laser_gun(src), slot_in_backpack)
Expand Down Expand Up @@ -470,6 +475,7 @@
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/color/black(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
// src.equip_if_possible(new /obj/item/weapon/crowbar(src), slot_in_backpack) //another job with toolbox and this
src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
Expand Down Expand Up @@ -533,6 +539,7 @@
if ("Chief Medical Officer")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(src), slot_wear_suit)
Expand All @@ -541,6 +548,7 @@
if ("Virologist")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.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.

0 comments on commit 4fbce68

Please sign in to comment.