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

Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"

Browse Source 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
This commit is contained in:
SandPoot
2021-02-18 15:04:46 -03:00
parent 2e29f30fdf
commit f738023097
223 changed files with 741 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/energy.dm
+1 -1
View File
@@ -279,7 +279,7 @@
to_chat(user, "<span class='notice'>[src] is now [choice].</span>")
/obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
if(W.tool_behaviour == TOOL_MULTITOOL)
if(istype(W, /obj/item/multitool))
if(user.a_intent == INTENT_DISARM)
if(!active)
to_chat(user, "<span class='warning'>COLOR_SET</span>")