Merge branch 'master' into master

2019-06-17 12:18:40 +01:00
parent fb70b97d5b 6c54c21d9c
commit 41eee65b15
121 changed files with 3642 additions and 904 deletions
@@ -28,7 +28,6 @@
 /obj/effect/immovablerod/wizard
 	var/max_distance = 13
 	var/damage_bonus = 0
-	var/mob/living/wizard
 	var/turf/start_turf
 	notify = FALSE