shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5791 from Citadel-Station-13/upstream-merge-36057

Browse Source 
[MIRROR] Fixes transforming weapons runtiming due to no butchering component
This commit is contained in:
deathride58
2018-03-05 02:43:07 +00:00
committed by GitHub
parent bed120d202 b7d33cbfaf
commit a853b6fc7d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/transforming.dm
+8 -3
View File
@@ -22,7 +22,7 @@
if(attack_verb_off.len)
attack_verb = attack_verb_off
if(is_sharp())
AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, active)
AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
/obj/item/melee/transforming/attack_self(mob/living/carbon/user)
if(transform_weapon(user))
@@ -61,8 +61,13 @@
attack_verb = attack_verb_off
icon_state = initial(icon_state)
w_class = initial(w_class)
GET_COMPONENT_FROM(butchering, /datum/component/butchering, src)
butchering.butchering_enabled = active
if(is_sharp())
var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
BT.butchering_enabled = TRUE
else
GET_COMPONENT(BT, /datum/component/butchering)
if(BT)
BT.butchering_enabled = FALSE
transform_messages(user, supress_message_text)
add_fingerprint(user)
return TRUE