Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

This commit is contained in:
Poojawa
2019-10-11 23:10:45 -05:00
215 changed files with 56939 additions and 56256 deletions
+3 -1
View File
@@ -35,7 +35,7 @@
if(!wielded || !user)
return
wielded = 0
if(force_unwielded)
if(!isnull(force_unwielded))
force = force_unwielded
var/sf = findtext(name," (Wielded)")
if(sf)
@@ -600,6 +600,8 @@
sharpness = IS_SHARP
actions_types = list(/datum/action/item_action/startchainsaw)
var/on = FALSE
tool_behaviour = TOOL_SAW
toolspeed = 0.5
/obj/item/twohanded/required/chainsaw/Initialize()
. = ..()