From fdfbb8fd93ebd0e4381175462e1ca1eebc96b546 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 9 Aug 2019 16:36:04 -0400 Subject: [PATCH] Fixes Sharpening Toy Swords --- code/game/objects/items/toys.dm | 1 + code/game/objects/items/weapons/twohanded.dm | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 09712304f87..8a40233bbdd 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -208,6 +208,7 @@ origin_tech = null attack_verb = list("attacked", "struck", "hit") brightness_on = 0 + sharp_when_wielded = FALSE // It's a toy /obj/item/twohanded/dualsaber/toy/hit_reaction() return 0 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index e7e91178890..15456386541 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -28,12 +28,15 @@ var/force_wielded = 0 var/wieldsound = null var/unwieldsound = null + var/sharp_when_wielded = FALSE /obj/item/twohanded/proc/unwield(mob/living/carbon/user) if(!wielded || !user) return wielded = FALSE force = force_unwielded + if(sharp_when_wielded) + sharp = FALSE var/sf = findtext(name," (Wielded)") if(sf) name = copytext(name, 1, sf) @@ -66,6 +69,8 @@ return wielded = TRUE force = force_wielded + if(sharp_when_wielded) + sharp = TRUE name = "[name] (Wielded)" update_icon() if(user) @@ -224,7 +229,7 @@ origin_tech = "magnets=4;syndicate=5" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 - sharp = TRUE + sharp_when_wielded = TRUE // only sharp when wielded light_power = 2 var/brightness_on = 2 var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)