Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:23:00 +00:00
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
@@ -20,7 +20,8 @@
 /obj/item/gun/energy/pulse/prize/Initialize()
 	. = ..()
 	GLOB.poi_list += src
-	var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(src)]"
+	var/turf/T = get_turf(src)
+	var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(T)]"

 	message_admins(msg)
 	log_game(msg)