Merge branch 'master' into upstream-merge-27773

code/game/objects/effects/contraband.dm

@@ -12,8 +12,8 @@
 	var/poster_type
 	var/obj/structure/sign/poster/poster_structure
 
-/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure)
-	..()
+/obj/item/weapon/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
+	. = ..()
 	poster_structure = new_poster_structure
 	if(!new_poster_structure && poster_type)
 		poster_structure = new poster_type(src)
@@ -58,8 +58,8 @@
 	var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here."
 	var/poster_item_icon_state = "rolled_poster"
 
-/obj/structure/sign/poster/New()
-	..()
+/obj/structure/sign/poster/Initialize()
+	. = ..()
 	if(random_basetype)
 		randomise(random_basetype)
 	if(!ruined)

code/game/objects/effects/landmarks.dm

@@ -182,7 +182,7 @@
 
 /obj/effect/landmark/latejoin/Initialize(mapload)
 	..()
-	GLOB.latejoin += loc
+	SSjob.latejoin_trackers += loc
 	qdel(src)
 
 // carp.

code/game/objects/effects/mines.dm

@@ -39,7 +39,7 @@
 	var/range_flash = 3
 
 /obj/effect/mine/explosive/mineEffect(mob/victim)
-	explosion(loc, range_devastation, range_heavy, range_light, range_flash)
+	explosion(loc, range_devastation, range_heavy, range_light, range_flash)
 
 
 /obj/effect/mine/stun
@@ -127,8 +127,8 @@
 	var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
 
 	spawn(0)
-		new /obj/effect/hallucination/delusion(victim.loc,victim,force_kind="demon",duration=duration,skip_nearby=0)
-
+		new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0)
+		
 	var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
 	chainsaw.flags |= NODROP
 	victim.drop_all_held_items()

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -169,7 +169,9 @@
 /obj/effect/temp_visual/fire
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "3"
-	duration = 20
+	light_range = 3
+	light_color = LIGHT_COLOR_FIRE
+	duration = 10
 
 /obj/effect/temp_visual/revenant
 	name = "spooky lights"

code/game/objects/effects/wanted_poster.dm

@@ -1,19 +1,18 @@
 /obj/item/weapon/poster/wanted
 	icon_state = "rolled_poster"
 
-/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description)
-	var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description)
-	..(loc, wanted_poster)
+/obj/item/weapon/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description)
+	. = ..(mapload, new /obj/structure/sign/poster/wanted(src, person_icon, wanted_name, description))
 	name = "wanted poster ([wanted_name])"
 	desc = "A wanted poster for [wanted_name]."
 
 /obj/structure/sign/poster/wanted
 	var/wanted_name
 
-/obj/structure/sign/poster/wanted/New(var/icon/person_icon, var/person_name, var/description)
+/obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description)
+	. = ..()
 	if(!person_icon)
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	name = "wanted poster ([person_name])"
 	wanted_name = person_name
 	desc = description