diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 714787dc90d..661f1149ab0 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -119,6 +119,8 @@ if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/ntcane(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5d6bd479c47..bf6344372cc 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -128,3 +128,19 @@ if(charges < 1) status = 0 update_icon() + + +/obj/item/weapon/melee/baton/ntcane + name = "fancy cane" + desc = "A cane with special engraving on it. It has a strange button on the handle..." + icon_state = "cane_nt" + item_state = "cane_nt" + + +/obj/item/weapon/melee/baton/ntcane/update_icon() + if(status) + icon_state = "cane_nt_active" + item_state = "cane_nt_active" + else + icon_state = "cane_nt" + item_state = "cane_nt" \ No newline at end of file diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index c9bcfa7281e..a627647d800 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -238,6 +238,13 @@ icon_on = "engravedzippoon" icon_off = "engravedzippo" +/obj/item/weapon/lighter/zippo/fluff/nt_rep + name = "gold engraved zippo" + desc = "An engraved golden Zippo lighter with the letters NT on it." + icon = 'icons/obj/custom_items.dmi' + icon_on = "zippo_nt_on" + icon_off = "zippo_nt_off" + /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel name = "purple comb" desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side." diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 92da878fb00..48ccba7584a 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 e4859949cde..183777e9a79 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 0b82c58bcca..4c61d4ef845 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 4e88f9997e3..d78c9b6a3ff 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ