From 9a8b9a29ee5c168cf35201a9a03022ffae4713e1 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 9 Jul 2016 22:41:46 -0400 Subject: [PATCH 1/2] Nanotrasen Rep Cane Tweak --- code/game/jobs/job/supervisor.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 7 ------- code/game/objects/items/weapons/swords_axes_etc.dm | 6 ++++++ .../mob/living/carbon/human/interactive/interactive.dm | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index d0281c4b7c1..7768cf11870 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -125,7 +125,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/baton/loaded/ntcane(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 6ab787e519f..df131be786c 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -187,13 +187,6 @@ /obj/item/weapon/melee/baton/loaded/robot hitcost = 1000 - -/obj/item/weapon/melee/baton/loaded/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" - //Makeshift stun baton. Replacement for stun gloves. /obj/item/weapon/melee/baton/cattleprod name = "stunprod" diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 0d39e6bd1c7..1d43fdc09e0 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -72,6 +72,12 @@ else return ..() +/obj/item/weapon/melee/classic_baton/ntcane + name = "fancy cane" + desc = "A cane with special engraving on it. It seems well suited for fending off assailants..." + icon_state = "cane_nt" + item_state = "cane_nt" + //Telescopic baton /obj/item/weapon/melee/classic_baton/telescopic name = "telescopic baton" diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm index 9e4b77f055f..ec65c450792 100644 --- a/code/modules/mob/living/carbon/human/interactive/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm @@ -320,7 +320,7 @@ if("Captain", "Head of Personnel") favoured_types = list(/obj/item/clothing, /obj/item/weapon/stamp/captain,/obj/item/weapon/disk/nuclear) if("Nanotrasen Representative") - favoured_types = list(/obj/item/clothing, /obj/item/weapon/stamp/centcom, /obj/item/weapon/paper, /obj/item/weapon/melee/baton/loaded/ntcane) + favoured_types = list(/obj/item/clothing, /obj/item/weapon/stamp/centcom, /obj/item/weapon/paper, /obj/item/weapon/melee/classic_baton/ntcane) functions += "paperwork" if("Magistrate", "Internal Affairs Agent") favoured_types = list(/obj/item/clothing, /obj/item/weapon/stamp/law, /obj/item/weapon/paper) From 0ef31800b7ea8399420ef1a7e7254c8df99d52b2 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 9 Jul 2016 22:50:05 -0400 Subject: [PATCH 2/2] whoops --- code/game/objects/items/weapons/swords_axes_etc.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 1d43fdc09e0..55f7c4d5eb8 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -77,6 +77,7 @@ desc = "A cane with special engraving on it. It seems well suited for fending off assailants..." icon_state = "cane_nt" item_state = "cane_nt" + needs_permit = 0 //Telescopic baton /obj/item/weapon/melee/classic_baton/telescopic