diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index 6f1c0541769..4eb711c38ef 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -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" diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 9d856dc33f0..508d42050b2 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -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" @@ -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" diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index e0d0765c262..54bf529351e 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 579e4ce2ff9..f11f3b3a1f8 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 2788fbc9fd0..eab9287d719 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 41a10f77ddc..d6ded2fbd6f 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 208482dfc1f..ea70a1b17a9 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index c19a4b12cb5..2931de8edf4 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1b6e75891c5..7d96dd7aef1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 660ecf7f017..c941d114e5d 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 3a869038e27..8bacefc2168 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ