merge conflict fix

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -283,13 +283,13 @@
 		var/area/A = get_area(location)
 
 		var/where = "[A.name] | [location.x], [location.y]"
-		var/whereLink = "<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
+		var/whereLink = "<A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[location.x];Y=[location.y];Z=[location.z]'>[where]</a>"
 
 		if(carry.my_atom.fingerprintslast)
 			var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
 			var/more = ""
 			if(M)
-				more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) "
+				more = "(<A HREF='?_src_=holder;[HrefToken()];adminmoreinfo=\ref[M]'>?</a>) (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</A>) "
 			message_admins("Smoke: ([whereLink])[contained]. Key: [carry.my_atom.fingerprintslast][more].", 0, 1)
 			log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
 		else

code/game/objects/effects/landmarks.dm

@@ -157,10 +157,26 @@
 /obj/effect/landmark/start/wizard
 	name = "wizard"
 
-/obj/effect/landmark/start/wizard/Initialize(mapload)
+/obj/effect/landmark/start/wizard/Initialize()
 	..()
 	GLOB.wizardstart += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/landmark/start/nukeop
+	name = "nukeop"
+
+/obj/effect/landmark/start/nukeop/Initialize()
+	..()
+	GLOB.nukeop_start += loc
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/landmark/start/nukeop_leader
+	name = "nukeop leader"
+
+/obj/effect/landmark/start/nukeop_leader/Initialize()
+	..()
+	GLOB.nukeop_leader_start += loc
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/start/new_player
 	name = "New Player"
@@ -173,7 +189,7 @@
 
 /obj/effect/landmark/start/new_player/Initialize(mapload)
 	..()
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 
 
@@ -183,7 +199,7 @@
 /obj/effect/landmark/latejoin/Initialize(mapload)
 	..()
 	SSjob.latejoin_trackers += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 // carp.
 /obj/effect/landmark/carpspawn
@@ -205,23 +221,6 @@
 /obj/effect/landmark/tripai
 	name = "tripai"
 
-// marauder entry (XXX WTF IS MAURADER ENTRY???)
-
-/obj/effect/landmark/marauder_entry
-	name = "Marauder Entry"
-
-// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER)
-
-/obj/effect/landmark/syndicate_breach_area
-	name = "Syndicate Breach Area"
-
-// teleport scroll landmark, XXX DOES THIS DO ANYTHING?
-/obj/effect/landmark/teleport_scroll
-	name = "Teleport-Scroll"
-
-/obj/effect/landmark/syndicate_spawn
-	name = "Syndicate-Spawn"
-
 // xenos.
 /obj/effect/landmark/xeno_spawn
 	name = "xeno_spawn"
@@ -229,7 +228,7 @@
 /obj/effect/landmark/xeno_spawn/Initialize(mapload)
 	..()
 	GLOB.xeno_spawn += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 // blobs.
 /obj/effect/landmark/blobstart
@@ -238,7 +237,7 @@
 /obj/effect/landmark/blobstart/Initialize(mapload)
 	..()
 	GLOB.blobstart += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/secequipment
 	name = "secequipment"
@@ -246,7 +245,7 @@
 /obj/effect/landmark/secequipment/Initialize(mapload)
 	..()
 	GLOB.secequipment += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/prisonwarp
 	name = "prisonwarp"
@@ -254,15 +253,15 @@
 /obj/effect/landmark/prisonwarp/Initialize(mapload)
 	..()
 	GLOB.prisonwarp += loc
-	qdel(src)
-
+	return INITIALIZE_HINT_QDEL
+	
 /obj/effect/landmark/ert_spawn
 	name = "Emergencyresponseteam"
 
 /obj/effect/landmark/ert_spawn/Initialize(mapload)
 	..()
 	GLOB.emergencyresponseteamspawn += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/holding_facility
 	name = "Holding Facility"
@@ -270,7 +269,7 @@
 /obj/effect/landmark/holding_facility/Initialize(mapload)
 	..()
 	GLOB.holdingfacility += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/observe
 	name = "tdomeobserve"
@@ -278,7 +277,7 @@
 /obj/effect/landmark/thunderdome/observe/Initialize(mapload)
 	..()
 	GLOB.tdomeobserve += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/one
 	name = "tdome1"
@@ -286,7 +285,7 @@
 /obj/effect/landmark/thunderdome/one/Initialize(mapload)
 	..()
 	GLOB.tdome1	+= loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/two
 	name = "tdome2"
@@ -294,7 +293,7 @@
 /obj/effect/landmark/thunderdome/two/Initialize(mapload)
 	..()
 	GLOB.tdome2 += loc
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/thunderdome/admin
 	name = "tdomeadmin"
@@ -302,6 +301,25 @@
 /obj/effect/landmark/thunderdome/admin/Initialize(mapload)
 	..()
 	GLOB.tdomeadmin += loc
+	return INITIALIZE_HINT_QDEL
+
+//Servant spawn locations
+/obj/effect/landmark/servant_of_ratvar
+	name = "servant of ratvar spawn"
+
+/obj/effect/landmark/servant_of_ratvar/Initialize(mapload)
+	..()
+	GLOB.servant_spawns += loc
+	qdel(src)
+
+//City of Cogs entrances
+/obj/effect/landmark/city_of_cogs
+	name = "city of cogs entrance"
+	icon_state = "x4"
+
+/obj/effect/landmark/city_of_cogs/Initialize(mapload)
+	..()
+	GLOB.city_of_cogs_spawns += loc
 	qdel(src)
 
 //generic event spawns

code/game/objects/effects/portals.dm

@@ -40,10 +40,10 @@
 
 /obj/effect/portal/attackby(obj/item/W, mob/user, params)
 	if(user && Adjacent(user))
-		teleport(user)
+		user.forceMove(get_turf(src))
 
 /obj/effect/portal/Crossed(atom/movable/AM, oldloc)
-	if(get_turf(oldloc) == get_turf(linked))
+	if(linked && (get_turf(oldloc) == get_turf(linked)))
 		return ..()
 	if(!teleport(AM))
 		return ..()
@@ -53,7 +53,7 @@
 
 /obj/effect/portal/attack_hand(mob/user)
 	if(Adjacent(user))
-		teleport(user)
+		user.forceMove(get_turf(src))
 
 /obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override)
 	. = ..()
@@ -125,7 +125,7 @@
 	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M)
-	if(!istype(M) || istype(M, /obj/effect) || (istype(M, /obj/mecha) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
+	if(!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
 		return
 	var/turf/real_target = get_link_target_turf()
 	if(!istype(real_target))

code/game/objects/effects/proximity.dm

@@ -33,7 +33,7 @@
 	if(!force_rebuild && range == current_range)
 		return FALSE
 	. = TRUE
-	
+
 	current_range = range
 
 	var/list/checkers_local = checkers

code/game/objects/effects/spawners/bundle.dm

@@ -12,7 +12,7 @@
 		var/turf/T = get_turf(src)
 		for(var/path in items)
 			new path(T)
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/bundle/costume/chicken
 	name = "chicken costume spawner"

code/game/objects/effects/spawners/lootdrop.dm

@@ -18,7 +18,7 @@
 			if(lootspawn)
 				new lootspawn(T)
 			lootcount--
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/spawner/lootdrop/armory_contraband
 	name = "armory contraband gun spawner"
@@ -89,7 +89,7 @@
 
 /obj/effect/spawner/lootdrop/maintenance/Initialize(mapload)
 	loot = GLOB.maintenance_loot
-	..()
+	. = ..()
 
 /obj/effect/spawner/lootdrop/crate_spawner
 	name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF!
@@ -130,7 +130,7 @@
 	loot = list()
 	for(var/path in subtypesof(/obj/effect/spawner/bundle/costume))
 		loot[path] = TRUE
-	..()
+	. = ..()
 
 // Minor lootdrops follow
 

code/game/objects/effects/spawners/xeno_egg_delivery.dm

@@ -17,4 +17,4 @@
 	log_game("An alien egg has been delivered to [A] at [COORD(T)]")
 	var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
 	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time))
-	qdel(src)
+	return INITIALIZE_HINT_QDEL

code/game/objects/effects/spiders.dm

@@ -52,6 +52,7 @@
 	icon_state = "eggs"
 	var/amount_grown = 0
 	var/player_spiders = 0
+	var/directive = "" //Message from the mother
 	var/poison_type = "toxin"
 	var/poison_per_bite = 5
 	var/list/faction = list("spiders")
@@ -71,6 +72,7 @@
 			S.poison_type = poison_type
 			S.poison_per_bite = poison_per_bite
 			S.faction = faction.Copy()
+			S.directive = directive
 			if(player_spiders)
 				S.player_spiders = 1
 		qdel(src)
@@ -87,10 +89,15 @@
 	var/obj/machinery/atmospherics/components/unary/vent_pump/entry_vent
 	var/travelling_in_vent = 0
 	var/player_spiders = 0
+	var/directive = "" //Message from the mother
 	var/poison_type = "toxin"
 	var/poison_per_bite = 5
 	var/list/faction = list("spiders")
 
+/obj/structure/spider/spiderling/Destroy()
+	new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src))
+	. = ..()
+
 /obj/structure/spider/spiderling/Initialize()
 	pixel_x = rand(6,-6)
 	pixel_y = rand(6,-6)
@@ -103,6 +110,15 @@
 /obj/structure/spider/spiderling/nurse
 	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse
 
+/obj/structure/spider/spiderling/midwife
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife
+
+/obj/structure/spider/spiderling/viper
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
+
+/obj/structure/spider/spiderling/tarantula
+	grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/tarantula
+
 /obj/structure/spider/spiderling/Collide(atom/user)
 	if(istype(user, /obj/structure/table))
 		src.loc = user.loc
@@ -171,11 +187,15 @@
 		amount_grown += rand(0,2)
 		if(amount_grown >= 100)
 			if(!grow_as)
-				grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse)
+				if(prob(3))
+					grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula, /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife)
+				else
+					grow_as = pick(/mob/living/simple_animal/hostile/poison/giant_spider, /mob/living/simple_animal/hostile/poison/giant_spider/hunter, /mob/living/simple_animal/hostile/poison/giant_spider/nurse)
 			var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc)
 			S.poison_per_bite = poison_per_bite
 			S.poison_type = poison_type
 			S.faction = faction.Copy()
+			S.directive = directive
 			if(player_spiders)
 				S.playable_spider = TRUE
 				notify_ghosts("Spider [S.name] can be controlled", null, enter_link="<a href=?src=\ref[S];activate=1>(Click to play)</a>", source=S, action=NOTIFY_ATTACK)
@@ -194,12 +214,12 @@
 	. = ..()
 
 /obj/structure/spider/cocoon/container_resist(mob/living/user)
-	var/breakout_time = 1
+	var/breakout_time = 600
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
-	to_chat(user, "<span class='notice'>You struggle against the tight bonds... (This will take about [breakout_time] minutes.)</span>")
+	to_chat(user, "<span class='notice'>You struggle against the tight bonds... (This will take about [DisplayTimeText(breakout_time)].)</span>")
 	visible_message("You see something struggling and writhing in \the [src]!")
-	if(do_after(user,(breakout_time*60*10), target = src))
+	if(do_after(user,(breakout_time), target = src))
 		if(!user || user.stat != CONSCIOUS || user.loc != src)
 			return
 		qdel(src)

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

@@ -199,3 +199,57 @@
 	duration = 80
 	icon_state = "sigilactiveoverlay"
 	alpha = 0
+
+/obj/effect/temp_visual/steam
+	name = "steam"
+	desc = "Steam! It's hot. It also serves as a game distribution platform."
+	icon_state = "smoke"
+	duration = 15
+
+/obj/effect/temp_visual/steam/Initialize(mapload, steam_direction)
+	. = ..()
+	setDir(steam_direction)
+	var/x_offset = 0
+	var/y_offset = 0
+	switch(dir)
+		if(NORTH)
+			y_offset = 8
+		if(EAST)
+			x_offset = 4
+			y_offset = 4
+		if(SOUTH)
+			y_offset = 2
+		if(WEST)
+			x_offset = -4
+			y_offset = 4
+	animate(src, pixel_x = x_offset, pixel_y = y_offset, alpha = 50, time = 15)
+
+/obj/effect/temp_visual/steam_release
+	name = "all the steam"
+
+/obj/effect/temp_visual/steam_release/Initialize()
+	..()
+	for(var/V in GLOB.cardinals)
+		var/turf/T = get_step(src, V)
+		new/obj/effect/temp_visual/steam(T, V)
+	return INITIALIZE_HINT_QDEL
+
+//Foreshadows a servant warping in.
+/obj/effect/temp_visual/ratvar/warp_marker
+	name = "illuminant marker"
+	desc = "A silhouette of dim light. It's getting brighter!"
+	resistance_flags = INDESTRUCTIBLE
+	icon = 'icons/effects/genetics.dmi'
+	icon_state = "servitude"
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	anchored = TRUE
+	alpha = 0
+	light_color = "#FFE48E"
+	light_range = 2
+	light_power = 0.7
+	duration = 55
+
+/obj/effect/temp_visual/ratvar/warp_marker/Initialize(mapload, mob/living/servant)
+	. = ..()
+	animate(src, alpha = 255, time = 50)
+

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

@@ -213,7 +213,7 @@
 /obj/effect/temp_visual/fire
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "3"
-	light_range = 3
+	light_range = LIGHT_RANGE_FIRE
 	light_color = LIGHT_COLOR_FIRE
 	duration = 10