Merge branch 'master' into upstream-merge-30203

2017-08-29 20:05:42 -07:00
parent 9c63ab2d39 0b82132443
commit 76e05ad88e
238 changed files with 5 additions and 3648 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm	(rejected hunks)
-@@ -7,7 +7,7 @@
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "syndballoon"
- 	item_state = null
-	flags = ABSTRACT | NODROP | DROPDEL
-+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
- 	w_class = WEIGHT_CLASS_HUGE
- 	force = 0
- 	throwforce = 0