Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00
parent 6a575f19d1 ae279fed73
commit e7d9cd0698
29 changed files with 103 additions and 44 deletions
@@ -392,7 +392,7 @@ Burning extracts:
 	throw_speed = 2
 	force = 15 //Heavy, but hard to wield.
 	attack_verb = list("bashed","pounded","slammed")
-	flags_2 = SLOWS_WHILE_IN_HAND_2
+	item_flags = SLOWS_WHILE_IN_HAND


 /obj/effect/proc_holder/spell/targeted/shapeshift/slimeform
@@ -417,4 +417,4 @@ Burning extracts:

 /mob/living/simple_animal/slime/transformedslime/Reproduce() //Just in case.
 	to_chat(src, "<span class='warning'>I can't reproduce...</span>")
-	return
+	return