Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54

2019-06-16 12:41:06 +02:00
parent 5142faa353 89dd3d4e87
commit a055f12394
74 changed files with 1317 additions and 614 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