Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/events/carp_migration.dm

@@ -69,7 +69,7 @@
 // Spawn a single carp at given location.
 /datum/event/carp_migration/proc/spawn_one_carp(var/loc)
 	var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/carp/event(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_carp_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_carp_destruction))
 	spawned_carp.Add(M)
 	return M
 
@@ -83,7 +83,7 @@
 // If carp is bomphed, remove it from the list.
 /datum/event/carp_migration/proc/on_carp_destruction(var/mob/M)
 	spawned_carp -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_carp_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_carp_destruction))
 
 /datum/event/carp_migration/end()
 	. = ..()

code/modules/events/gnat_migration.dm

@@ -69,7 +69,7 @@
 // Spawn a single gnat at given location.
 /datum/event/gnat_migration/proc/spawn_one_gnat(var/loc)
 	var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/gnat(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_gnat_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_gnat_destruction))
 	spawned_gnat.Add(M)
 	return M
 
@@ -83,7 +83,7 @@
 // If gnat is bomphed, remove it from the list.
 /datum/event/gnat_migration/proc/on_gnat_destruction(var/mob/M)
 	spawned_gnat -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_gnat_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_gnat_destruction))
 
 /datum/event/gnat_migration/end()
 	. = ..()

code/modules/events/infestation.dm

@@ -53,7 +53,7 @@
 // Spawn a single vermin at given location.
 /datum/event/infestation/proc/spawn_one_vermin(var/loc)
 	var/mob/living/simple_mob/animal/M = new spawn_types(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_vermin_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_vermin_destruction))
 	spawned_vermin.Add(M)
 	return M
 
@@ -67,7 +67,7 @@
 // If vermin is kill, remove it from the list.
 /datum/event/infestation/proc/on_vermin_destruction(var/mob/M)
 	spawned_vermin -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_vermin_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_vermin_destruction))
 
 
 
@@ -75,4 +75,4 @@
 	command_announcement.Announce("Bioscans indicate that [vermstring] have been breeding all over the facility. Clear them out, before this starts to affect productivity.", "Vermin infestation")
 
 #undef VERM_MICE
-#undef VERM_LIZARDS
+#undef VERM_LIZARDS

code/modules/events/jellyfish_migration.dm

@@ -69,7 +69,7 @@
 // Spawn a single jellyfish at given location.
 /datum/event/jellyfish_migration/proc/spawn_one_jellyfish(var/loc)
 	var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_jellyfish_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_jellyfish_destruction))
 	spawned_jellyfish.Add(M)
 	return M
 
@@ -83,7 +83,7 @@
 // If jellyfish is bomphed, remove it from the list.
 /datum/event/jellyfish_migration/proc/on_jellyfish_destruction(var/mob/M)
 	spawned_jellyfish -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_jellyfish_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_jellyfish_destruction))
 
 /datum/event/jellyfish_migration/end()
 	. = ..()

code/modules/events/ray_migration.dm

@@ -69,7 +69,7 @@
 // Spawn a single ray at given location.
 /datum/event/ray_migration/proc/spawn_one_ray(var/loc)
 	var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/ray(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_ray_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_ray_destruction))
 	spawned_ray.Add(M)
 	return M
 
@@ -83,7 +83,7 @@
 // If ray is bomphed, remove it from the list.
 /datum/event/ray_migration/proc/on_ray_destruction(var/mob/M)
 	spawned_ray -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_ray_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_ray_destruction))
 
 /datum/event/ray_migration/end()
 	. = ..()

code/modules/events/shark_migration.dm

@@ -69,7 +69,7 @@
 // Spawn a single shark at given location.
 /datum/event/shark_migration/proc/spawn_one_shark(var/loc)
 	var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/shark/event(loc)
-	GLOB.destroyed_event.register(M, src, .proc/on_shark_destruction)
+	GLOB.destroyed_event.register(M, src, PROC_REF(on_shark_destruction))
 	spawned_shark.Add(M)
 	return M
 
@@ -83,7 +83,7 @@
 // If shark is bomphed, remove it from the list.
 /datum/event/shark_migration/proc/on_shark_destruction(var/mob/M)
 	spawned_shark -= M
-	GLOB.destroyed_event.unregister(M, src, .proc/on_shark_destruction)
+	GLOB.destroyed_event.unregister(M, src, PROC_REF(on_shark_destruction))
 
 /datum/event/shark_migration/end()
 	. = ..()