Merge branch 'master' into upstream-merge-32183

code/game/gamemodes/antag_spawner.dm

@@ -29,13 +29,13 @@
 		dat += "<I>Using this contract, you may summon an apprentice to aid you on your mission.</I><BR>"
 		dat += "<I>If you are unable to establish contact with your apprentice, you can feed the contract back to the spellbook to refund your points.</I><BR>"
 		dat += "<B>Which school of magic is your apprentice studying?:</B><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_DESTRUCTION]'>Destruction</A><BR>"
+		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_DESTRUCTION]'>Destruction</A><BR>"
 		dat += "<I>Your apprentice is skilled in offensive magic. They know Magic Missile and Fireball.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_BLUESPACE]'>Bluespace Manipulation</A><BR>"
+		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_BLUESPACE]'>Bluespace Manipulation</A><BR>"
 		dat += "<I>Your apprentice is able to defy physics, melting through solid objects and travelling great distances in the blink of an eye. They know Teleport and Ethereal Jaunt.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_HEALING]'>Healing</A><BR>"
+		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_HEALING]'>Healing</A><BR>"
 		dat += "<I>Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.</I><BR>"
-		dat += "<A href='byond://?src=\ref[src];school=[APPRENTICE_ROBELESS]'>Robeless</A><BR>"
+		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_ROBELESS]'>Robeless</A><BR>"
 		dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -226,6 +226,8 @@
 	. = ..()
 	if(!independent) //no pulling people deep into the blob
 		verbs -= /mob/living/verb/pulled
+	else
+		pass_flags &= ~PASSBLOB
 
 /mob/living/simple_animal/hostile/blob/blobbernaut/Life()
 	if(..())

code/game/gamemodes/blob/overmind.dm

@@ -91,10 +91,13 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 		if(!Ablob.blob_allowed)
 			continue
-
-		playsound(L, 'sound/effects/splat.ogg', 50, 1)
-		L.death()
-		new/mob/living/simple_animal/hostile/blob/blobspore(T)
+		
+		if(!("blob" in L.faction))
+			playsound(L, 'sound/effects/splat.ogg', 50, 1)
+			L.death()
+			new/mob/living/simple_animal/hostile/blob/blobspore(T)
+		else
+			L.fully_heal()
 
 		for(var/V in GLOB.sortedAreas)
 			var/area/A = V

code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm

@@ -1,8 +1,7 @@
 /obj/item/clockwork/slab //Clockwork slab: The most important tool in Ratvar's arsenal. Allows scripture recital, tutorials, and generates components.
 	name = "clockwork slab"
 	desc = "A strange metal tablet. A clock in the center turns around and around."
-	clockwork_desc = "A link between you and the Celestial Derelict. It contains information, recites scripture, and is your most vital tool as a Servant.\n\
-	Hitting a slab, a Servant with a slab, or a cache will <b>transfer</b> this slab's components into the target, the target's slab, or the global cache, respectively."
+	clockwork_desc = "A link between you and the Celestial Derelict. It contains information, recites scripture, and is your most vital tool as a Servant."
 	icon_state = "dread_ipad"
 	lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
@@ -231,7 +230,7 @@
 			this will cause you to whisper your message aloud, so doing so in a public place is very suspicious and you should try to restrict it to private use.<br><br>"
 			dat += "If you aren't willing or don't have the time to read through every section, you can still help your teammates! Ask if they've set up a base. If they have, head there \
 			and ask however you can help; chances are there's always something. If not, it's your job as a Servant to get one up and running! Try to find a secluded, low-traffic area, \
-			like the auxilary base or somewhere deep in maintenance. You'll want to go into the Drivers section of the slab and look for <i>Tinkerer's Cache.</i> Find a nice spot and \
+			like the auxiliary base or somewhere deep in maintenance. You'll want to go into the Drivers section of the slab and look for <i>Tinkerer's Cache.</i> Find a nice spot and \
 			create one. This serves as a storage for <i>components,</i> the cult's primary resource. (Your slab's probably produced a few by now.) By attacking that cache with this \
 			slab, you'll offload all your components into it, and all Servants will be able to use those components from any distance - all Tinkerer's Caches are linked!<br><br>"
 			dat += "Once you have a base up and running, contact your fellows and let them know. You should come back here often to drop off the slab's components, and your fellows \
@@ -250,7 +249,7 @@
 			teamwork is an instrumental component of your success.<br><br>" //get it? component? ha!
 			dat += "As a Servant of Ratvar, the tools you are given focus around building and maintaining bases and outposts. A great deal of your power comes from stationary \
 			structures, and without constructing a base somewhere, it's essentially impossible to succeed. Finding a good spot to build a base can be difficult, and it's recommended \
-			that you choose an area in low-traffic part of the station (such as the auxilary base). Make sure to disconnect any cameras in the area beforehand.<br><br>"
+			that you choose an area in low-traffic part of the station (such as the auxiliary base). Make sure to disconnect any cameras in the area beforehand.<br><br>"
 			dat += "Because of how complex being a Servant is, it isn't possible to fit much information into this section. It's highly recommended that you read the <b>Components</b> \
 			and <b>Scripture</b> sections next. Not knowing how these two systems work will cripple both you and your fellows, and lead to a frustrating experience for everyone.<br><br>"
 			dat += "<font color=#BE8700 size=3>-=-=-=-=-=-</font>"

code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm

@@ -17,6 +17,7 @@
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	weather_immunities = list("lava")
 	movement_type = FLYING
+	a_intent = INTENT_HARM
 	loot = list(/obj/item/clockwork/component/geis_capacitor/fallen_armor)
 	light_range = 2
 	light_power = 1.1
@@ -24,7 +25,6 @@
 	unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!<br><br>Obey the Servants and do as they \
 	tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm.</b>"
 	empower_string = "<span class='neovgre'>The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable.</span>"
-	var/deflect_chance = 40 //Chance to deflect any given projectile (non-damaging energy projectiles are always deflected)
 	var/max_shield_health = 3
 	var/shield_health = 3 //Amount of projectiles that can be deflected within
 	var/shield_health_regen = 0 //When world.time equals this, shield health will regenerate
@@ -55,8 +55,6 @@
 		obj_damage = 100
 		max_shield_health = INFINITY
 	else if(GLOB.ratvar_approaches) //Hefty health bonus and slight attack damage increase
-		health = 200
-		maxHealth = 200
 		melee_damage_upper = 15
 		melee_damage_lower = 15
 		attacktext = "carves"

code/game/gamemodes/clock_cult/clock_scripture.dm

@@ -53,6 +53,7 @@ Applications: 8 servants, 3 caches, and 100 CV
 		if(slab.busy)
 			to_chat(invoker, "<span class='warning'>[slab] refuses to work, displaying the message: \"[slab.busy]!\"</span>")
 			return FALSE
+		pre_recital()
 		slab.busy = "Invocation ([name]) in progress"
 		if(GLOB.ratvar_awakens)
 			channel_time *= 0.5 //if ratvar has awoken, half channel time and no cost
@@ -176,6 +177,9 @@ Applications: 8 servants, 3 caches, and 100 CV
 /datum/clockwork_scripture/proc/scripture_fail() //Called if the scripture fails to invoke.
 
 
+/datum/clockwork_scripture/proc/pre_recital() //Called before the scripture is recited
+
+
 /datum/clockwork_scripture/proc/post_recital() //Called after the scripture is recited
 
 //Channeled scripture begins instantly but runs constantly

code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm

@@ -7,12 +7,12 @@
 /datum/clockwork_scripture/create_object/construct/clockwork_marauder
 	descname = "Well-Rounded Combat Construct"
 	name = "Clockwork Marauder"
-	desc = "Creates a shell for a clockwork marauder, a balanced frontline construct."
+	desc = "Creates a shell for a clockwork marauder, a balanced frontline construct that can deflect projectiles with its shield."
 	invocations = list("Arise, avatar of Arbiter!", "Defend the Ark with vengeful zeal.")
 	channel_time = 50
 	power_cost = 1000
 	creator_message = "<span class='brass'>Your slab disgorges several chunks of replicant alloy that form into a suit of thrumming armor.</span>"
-	usage_tip = "The marauder's shield can effectively deflect energy-based projectiles."
+	usage_tip = "Reciting this scripture multiple times in a short period will cause it to take longer!"
 	tier = SCRIPTURE_APPLICATION
 	one_per_tile = TRUE
 	primary_component = BELLIGERENT_EYE
@@ -22,6 +22,9 @@
 	object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder
 	construct_type = /mob/living/simple_animal/hostile/clockwork/marauder
 	combat_construct = TRUE
+	var/static/recent_marauders = 0
+	var/static/time_since_last_marauder = 0
+	var/static/scaled_recital_time = 0
 
 /datum/clockwork_scripture/create_object/construct/clockwork_marauder/update_construct_limit()
 	var/human_servants = 0
@@ -32,15 +35,30 @@
 	construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders
 	construct_limit = Clamp(construct_limit, 1, 3)
 
-/datum/clockwork_scripture/create_object/prolonging_prism/check_special_requirements()
-	if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
-		to_chat(invoker, "<span class='inathneq'>\"It is too late to construct one of these, champion.\"</span>")
-		return FALSE
-	var/turf/T = get_turf(invoker)
-	if(!T || !(T.z in GLOB.station_z_levels))
-		to_chat(invoker, "<span class='inathneq'>\"You must be on the station to construct one of these, champion.\"</span>")
-		return FALSE
-	return ..()
+/datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital()
+	channel_time = initial(channel_time)
+	calculate_scaling()
+	if(scaled_recital_time)
+		to_chat(invoker, "<span class='warning'>The Hierophant Network is under strain from repeated summoning, making this scripture [scaled_recital_time / 10] seconds slower!</span>")
+		channel_time += scaled_recital_time
+	return TRUE
+
+/datum/clockwork_scripture/create_object/construct/clockwork_marauder/scripture_effects()
+	. = ..()
+	time_since_last_marauder = world.time
+	recent_marauders++
+	calculate_scaling()
+
+/datum/clockwork_scripture/create_object/construct/clockwork_marauder/proc/calculate_scaling()
+	var/WT = world.time
+	var/MT = time_since_last_marauder //Cast it for quicker reference
+	var/marauders_to_exclude = 0
+	if(world.time >= time_since_last_marauder + MARAUDER_SCRIPTURE_SCALING_THRESHOLD)
+		marauders_to_exclude = round(WT - MT) / MARAUDER_SCRIPTURE_SCALING_THRESHOLD //If at least 20 seconds have passed, lose one marauder for each 20 seconds
+		//i.e. world.time = 10000, last marauder = 9000, so we lose 5 marauders from the recent count since 10k - 9k = 1k, 1k / 200 = 5
+		time_since_last_marauder = world.time //So that it can't be spammed to make the marauder exclusion plummet; this emulates "ticking"
+	recent_marauders = max(0, recent_marauders - marauders_to_exclude)
+	scaled_recital_time = min(recent_marauders * MARAUDER_SCRIPTURE_SCALING_TIME, MARAUDER_SCRIPTURE_SCALING_MAX)
 
 
 //Mania Motor: Creates a malevolent transmitter that will broadcast the whispers of Sevtug into the minds of nearby nonservants, causing a variety of mental effects at a power cost.

code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -134,11 +134,21 @@
 	var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down
 	take_damage(damage, BRUTE, "bomb", 0)
 
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time(var/deciseconds = TRUE)
+	if(seconds_until_activation)
+		. = seconds_until_activation
+	else if(grace_period)
+		. = grace_period
+	else if(GATEWAY_RATVAR_ARRIVAL - progress_in_seconds > 0)
+		. = round(max((GATEWAY_RATVAR_ARRIVAL - progress_in_seconds) / (GATEWAY_SUMMON_RATE), 0), 1)
+	if(deciseconds)
+		. *= 10
+
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time)
 	if(seconds_until_activation)
-		return "[seconds_until_activation][s_on_time ? "S" : ""]"
+		return "[get_arrival_time()][s_on_time ? "S" : ""]"
 	if(grace_period)
-		return "[grace_period][s_on_time ? "S" : ""]"
+		return "[get_arrival_time()][s_on_time ? "S" : ""]"
 	. = "IMMINENT"
 	if(!obj_integrity)
 		. = "DETONATING"
@@ -151,12 +161,12 @@
 	icon_state = initial(icon_state)
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		if(!active)
-			to_chat(user, "<span class='big'><b>Time until the Ark's activation:</b> [DisplayTimeText(get_arrival_text(FALSE))]</span>")
+			to_chat(user, "<span class='big'><b>Time until the Ark's activation:</b> [DisplayTimeText(get_arrival_time())]</span>")
 		else
 			if(grace_period)
-				to_chat(user, "<span class='big'><b>Crew grace period time remaining:</b> [DisplayTimeText(get_arrival_text(FALSE))]</span>")
+				to_chat(user, "<span class='big'><b>Crew grace period time remaining:</b> [DisplayTimeText(get_arrival_time())]</span>")
 			else
-				to_chat(user, "<span class='big'><b>Time until Ratvar's arrival:</b> [DisplayTimeText(get_arrival_text(FALSE))]</span>")
+				to_chat(user, "<span class='big'><b>Time until Ratvar's arrival:</b> [DisplayTimeText(get_arrival_time())]</span>")
 				switch(progress_in_seconds)
 					if(-INFINITY to GATEWAY_REEBE_FOUND)
 						to_chat(user, "<span class='heavy_brass'>The Ark is feeding power into the bluespace field.</span>")
@@ -267,10 +277,10 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/attack_ghost(mob/user)
 	if(!IsAdminGhost(user))
-		return
+		return ..()
 	if(GLOB.servants_active)
 		to_chat(user, "<span class='danger'>The Ark is already counting down.</span>")
-		return
+		return ..()
 	if(alert(user, "Activate the Ark's countdown?", name, "Yes", "No") == "Yes")
 		if(alert(user, "REALLY activate the Ark's countdown?", name, "Yes", "No") == "Yes")
 			if(alert(user, "You're REALLY SURE? This cannot be undone.", name, "Yes - Activate the Ark", "No") == "Yes - Activate the Ark")

code/game/gamemodes/cult/cult_items.dm

@@ -324,7 +324,7 @@
 	icon_state = "cult_armor"
 	item_state = "cult_armor"
 	desc = "A heavily-armored exosuit worn by warriors of the Nar-Sien cult. It can withstand hard vacuum."
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = WEIGHT_CLASS_BULKY
 	allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/)
 	armor = list(melee = 70, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 40, acid = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult

code/game/gamemodes/cult/supply.dm

@@ -22,7 +22,7 @@
 	dat += "<HR>"
 	for(var/s in possible_summons)
 		var/datum/cult_supply/S = s
-		dat += "<a href='?src=\ref[src];id=[initial(S.id)]'>[initial(S.invocation)]</a> - [initial(S.desc)]<br>"
+		dat += "<a href='?src=[REF(src)];id=[initial(S.id)]'>[initial(S.invocation)]</a> - [initial(S.desc)]<br>"
 	var/datum/browser/popup = new(user, "talisman", "", 400, 400)
 	popup.set_content(dat.Join(""))
 	popup.open()

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -17,6 +17,7 @@
 	var/ascended = FALSE
 	sight = (SEE_TURFS | SEE_OBJS)
 	status_flags = CANPUSH
+	spacewalk = TRUE
 	mob_size = MOB_SIZE_LARGE
 	var/mob/living/oldform
 	var/list/devil_overlays[DEVIL_TOTAL_LAYERS]
@@ -135,9 +136,6 @@
 		"<span class='userdanger'>[attack_message]</span>", null, COMBAT_MESSAGE_RANGE)
 	return TRUE
 
-/mob/living/carbon/true_devil/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/carbon/true_devil/singularity_act()
 	if(ascended)
 		return 0

code/game/gamemodes/game_mode.dm

@@ -160,7 +160,7 @@
 	if(CONFIG_GET(flag/protect_assistant_from_antagonist))
 		replacementmode.restricted_jobs += "Assistant"
 
-	message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit <A HREF='?_src_=holder;[HrefToken()];toggle_midround_antag=\ref[usr]'>stop the creation of antags</A> or <A HREF='?_src_=holder;[HrefToken()];end_round=\ref[usr]'>end the round now</A>.")
+	message_admins("The roundtype will be converted. If you have other plans for the station or feel the station is too messed up to inhabit <A HREF='?_src_=holder;[HrefToken()];toggle_midround_antag=[REF(usr)]'>stop the creation of antags</A> or <A HREF='?_src_=holder;[HrefToken()];end_round=[REF(usr)]'>end the round now</A>.")
 
 	. = 1
 	sleep(rand(600,1800))

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -133,9 +133,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	dat += "<B>Install Module:</B><BR>"
 	dat += "<I>The number afterwards is the amount of processing time it consumes.</I><BR>"
 	for(var/datum/AI_Module/large/module in possible_modules)
-		dat += "<A href='byond://?src=\ref[src];[module.mod_pick_name]=1'>[module.module_name]</A><A href='byond://?src=\ref[src];showdesc=[module.mod_pick_name]'>\[?\]</A> ([module.cost])<BR>"
+		dat += "<A href='byond://?src=[REF(src)];[module.mod_pick_name]=1'>[module.module_name]</A><A href='byond://?src=[REF(src)];showdesc=[module.mod_pick_name]'>\[?\]</A> ([module.cost])<BR>"
 	for(var/datum/AI_Module/small/module in possible_modules)
-		dat += "<A href='byond://?src=\ref[src];[module.mod_pick_name]=1'>[module.module_name]</A><A href='byond://?src=\ref[src];showdesc=[module.mod_pick_name]'>\[?\]</A> ([module.cost])<BR>"
+		dat += "<A href='byond://?src=[REF(src)];[module.mod_pick_name]=1'>[module.module_name]</A><A href='byond://?src=[REF(src)];showdesc=[module.mod_pick_name]'>\[?\]</A> ([module.cost])<BR>"
 	dat += "<HR>"
 	if(temp)
 		dat += "[temp]"
@@ -679,7 +679,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		C.images -= I
 
 /mob/living/silicon/ai/proc/can_place_transformer(datum/action/innate/ai/place_transformer/action)
-	if(!eyeobj || !isturf(loc) || !canUseTopic() || !action)
+	if(!eyeobj || !isturf(loc) || incapacitated() || !action)
 		return
 	var/turf/middle = get_turf(eyeobj)
 	var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z))

code/game/gamemodes/miniantags/abduction/machinery/console.dm

@@ -43,20 +43,20 @@
 		dat += "Collected Samples : [points] <br>"
 		dat += "Gear Credits: [credits] <br>"
 		dat += "<b>Transfer data in exchange for supplies:</b><br>"
-		dat += "<a href='?src=\ref[src];dispense=baton'>Advanced Baton</A><br>"
-		dat += "<a href='?src=\ref[src];dispense=helmet'>Agent Helmet</A><br>"
-		dat += "<a href='?src=\ref[src];dispense=vest'>Agent Vest</A><br>"
-		dat += "<a href='?src=\ref[src];dispense=silencer'>Radio Silencer</A><br>"
-		dat += "<a href='?src=\ref[src];dispense=tool'>Science Tool</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=baton'>Advanced Baton</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=helmet'>Agent Helmet</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=vest'>Agent Vest</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=silencer'>Radio Silencer</A><br>"
+		dat += "<a href='?src=[REF(src)];dispense=tool'>Science Tool</A><br>"
 	else
 		dat += "<span class='bad'>NO EXPERIMENT MACHINE DETECTED</span> <br>"
 
 	if(pad)
 		dat += "<span class='bad'>Emergency Teleporter System.</span>"
 		dat += "<span class='bad'>Consider using primary observation console first.</span>"
-		dat += "<a href='?src=\ref[src];teleporter_send=1'>Activate Teleporter</A><br>"
+		dat += "<a href='?src=[REF(src)];teleporter_send=1'>Activate Teleporter</A><br>"
 		if(gizmo && gizmo.marked)
-			dat += "<a href='?src=\ref[src];teleporter_retrieve=1'>Retrieve Mark</A><br>"
+			dat += "<a href='?src=[REF(src)];teleporter_retrieve=1'>Retrieve Mark</A><br>"
 		else
 			dat += "<span class='linkOff'>Retrieve Mark</span><br>"
 	else
@@ -66,15 +66,15 @@
 		dat += "<h4> Agent Vest Mode </h4><br>"
 		var/mode = vest.mode
 		if(mode == VEST_STEALTH)
-			dat += "<a href='?src=\ref[src];flip_vest=1'>Combat</A>"
+			dat += "<a href='?src=[REF(src)];flip_vest=1'>Combat</A>"
 			dat += "<span class='linkOff'>Stealth</span>"
 		else
 			dat += "<span class='linkOff'>Combat</span>"
-			dat += "<a href='?src=\ref[src];flip_vest=1'>Stealth</A>"
+			dat += "<a href='?src=[REF(src)];flip_vest=1'>Stealth</A>"
 
 		dat+="<br>"
-		dat += "<a href='?src=\ref[src];select_disguise=1'>Select Agent Vest Disguise</a><br>"
-		dat += "<a href='?src=\ref[src];toggle_vest=1'>[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest</a><br>"
+		dat += "<a href='?src=[REF(src)];select_disguise=1'>Select Agent Vest Disguise</a><br>"
+		dat += "<a href='?src=[REF(src)];toggle_vest=1'>[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest</a><br>"
 	else
 		dat += "<span class='bad'>NO AGENT VEST DETECTED</span>"
 	var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500)

code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm

@@ -48,7 +48,7 @@
 		item_count++
 		var/g_color = gland_colors[i]
 		var/amount = amounts[i]
-		dat += "<a class='box gland' style='background-color:[g_color]' href='?src=\ref[src];dispense=[i]'>[amount]</a>"
+		dat += "<a class='box gland' style='background-color:[g_color]' href='?src=[REF(src)];dispense=[i]'>[amount]</a>"
 		if(item_count == 4) // Four boxes per line
 			dat +="</br></br>"
 			item_count = 0

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -104,9 +104,9 @@
 		dat += "<table><tr><td>"
 		dat += "<img src=dissection_img height=80 width=80>" //Avert your eyes
 		dat += "</td><td>"
-		dat += "<a href='?src=\ref[src];experiment=1'>Probe</a><br>"
-		dat += "<a href='?src=\ref[src];experiment=2'>Dissect</a><br>"
-		dat += "<a href='?src=\ref[src];experiment=3'>Analyze</a><br>"
+		dat += "<a href='?src=[REF(src)];experiment=1'>Probe</a><br>"
+		dat += "<a href='?src=[REF(src)];experiment=2'>Dissect</a><br>"
+		dat += "<a href='?src=[REF(src)];experiment=3'>Analyze</a><br>"
 		dat += "</td></tr></table>"
 	else
 		dat += "<span class='linkOff'>Experiment </span>"
@@ -127,8 +127,8 @@
 	dat += "<br>"
 	dat += "[flash]"
 	dat += "<br>"
-	dat += "<a href='?src=\ref[src];refresh=1'>Scan</a>"
-	dat += "<a href='?src=\ref[src];[state_open ? "close=1'>Close</a>" : "open=1'>Open</a>"]"
+	dat += "<a href='?src=[REF(src)];refresh=1'>Scan</a>"
+	dat += "<a href='?src=[REF(src)];[state_open ? "close=1'>Close</a>" : "open=1'>Open</a>"]"
 	var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300)
 	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
 	popup.set_content(dat)

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -21,6 +21,7 @@
 	maxHealth = INFINITY
 	layer = GHOST_LAYER
 	healable = FALSE
+	spacewalk = TRUE
 	sight = SEE_SELF
 
 	see_in_dark = 8
@@ -153,8 +154,6 @@
 
 
 //Immunities
-/mob/living/simple_animal/revenant/Process_Spacemove(movement_dir = 0)
-	return 1
 
 /mob/living/simple_animal/revenant/ex_act(severity, target)
 	return 1 //Immune to the effects of explosions.

code/game/gamemodes/nuclear/nuclear.dm

@@ -91,9 +91,11 @@
 	var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge
 	synd_mind.current.put_in_hands(challenge, TRUE)
 
-	var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id)
+	var/static/id_cache = typecacheof(/obj/item/card/id)
+	var/list/foundIDs = typecache_filter_list(synd_mind.current.GetAllContents(), id_cache)
 	if(foundIDs.len)
-		for(var/obj/item/card/id/ID in foundIDs)
+		for(var/i in 1 to foundIDs.len)
+			var/obj/item/card/id/ID = foundIDs[i]
 			ID.name = "lead agent card"
 			ID.access += ACCESS_SYNDICATE_LEADER
 	else

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -77,6 +77,7 @@
 	icon = 'icons/obj/machines/nuke_terminal.dmi'
 	icon_state = "nuclearbomb_base"
 	anchored = TRUE //stops it being moved
+	use_tag = TRUE
 
 /obj/machinery/nuclearbomb/syndicate
 	//ui_style = "syndicate" // actually the nuke op bomb is a stole nt bomb

code/game/gamemodes/sandbox/airlock_maker.dm

@@ -1,139 +1,139 @@
-/*
-	This is for the sandbox for now,
-	maybe useful later for an actual thing?
-	-Sayu
-*/
-
-/obj/structure/door_assembly
-	var/datum/airlock_maker/maker = null
-
-/obj/structure/door_assembly/attack_hand()
-	..()
-	if(maker)
-		maker.interact()
-
-/datum/airlock_maker
-	var/obj/structure/door_assembly/linked = null
-
-	var/list/access_used = null
-	var/require_all = 1
-
-	var/paintjob = "none"
-	var/glassdoor = 0
-
-	var/doorname = "airlock"
-
-/datum/airlock_maker/New(var/atom/target_loc)
-	linked = new(target_loc)
-	linked.maker = src
-	linked.anchored = FALSE
-	access_used = list()
-
-	interact()
-
-/datum/airlock_maker/proc/linkpretty(href,desc,active)
-	if(!desc)
-		var/static/list/defaults = list("No","Yes")
-		desc = defaults[active+1]
-	if(active)
-		return "<a href='?src=\ref[src];[href]'><b>[desc]</b></a>"
-	return "<a href='?src=\ref[src];[href]'><i>[desc]</i></a>"
-
-/datum/airlock_maker/proc/interact()
-	var/list/leftcolumn = list()
-	var/list/rightcolumn = list()
-	leftcolumn += "<u><b>Required Access</b></u>"
-	for(var/access in get_all_accesses())
-		leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used)
-	leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]"
-
-	rightcolumn += "<u><b>Paintjob</b></u>"
-	for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity"))
-		rightcolumn += linkpretty("paint=[option]",option,option == paintjob)
-	rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "<br><br>"
-	var/length = max(leftcolumn.len,rightcolumn.len)
-
-	var/dat = "You may move the model airlock around.  A new airlock will be built in its space when you click done, below.<hr><br>"
-	dat += "<a href='?src=\ref[src];rename'>Door name</a>: \"[doorname]\""
-	dat += "<table>"
-	for(var/i=1; i<=length; i++)
-		dat += "<tr><td>"
-		if(i<=leftcolumn.len)
-			dat += leftcolumn[i]
-		dat += "</td><td>"
-		if(i<=rightcolumn.len)
-			dat += rightcolumn[i]
-		dat += "</td></tr>"
-
-	dat += "</table><hr><a href='?src=\ref[src];done'>Finalize Airlock Construction</a> | <a href='?src=\ref[src];cancel'>Cancel and Destroy Airlock</a>"
-	usr << browse(dat,"window=airlockmaker")
-
-/datum/airlock_maker/Topic(var/href,var/list/href_list)
-	if(!usr)
-		return
-	if(!src || !linked || !linked.loc)
-		usr << browse(null,"window=airlockmaker")
-		return
-
-	if("rename" in href_list)
-		var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname)
-		if(newname)
-			doorname = newname
-	if("access" in href_list)
-		var/value = text2num(href_list["access"])
-		access_used ^= value
-	if("reqall" in href_list)
-		require_all = !require_all
-	if("paint" in href_list)
-		paintjob = href_list["paint"]
-	if("glass" in href_list)
-		glassdoor = !glassdoor
-
-	if("cancel" in href_list)
-		usr << browse(null,"window=airlockmaker")
-		qdel(linked)
-		qdel(src)
-		return
-
-	if("done" in href_list)
-		usr << browse(null,"window=airlockmaker")
-		var/turf/t_loc = linked.loc
-		qdel(linked)
-		if(!istype(t_loc))
-			return
-
-		var/target_type = "/obj/machinery/door/airlock"
-		if(glassdoor)
-			if(paintjob != "none")
-				if(paintjob in list("external","highsecurity","maintenance")) // no glass version
-					target_type += "/[paintjob]"
-				else
-					target_type += "/glass_[paintjob]"
-			else
-				target_type += "/glass"
-		else if(paintjob != "none")
-			target_type += "/[paintjob]"
-		var/final = target_type
-		target_type = text2path(final)
-		if(!target_type)
-			to_chat(usr, "Didn't work, contact Sayu with this: [final]")
-			usr << browse(null,"window=airlockmaker")
-			return
-
-		var/obj/machinery/door/D = new target_type(t_loc)
-
-		D.name = doorname
-
-		if(access_used.len == 0)
-			D.req_access = null
-			D.req_one_access = null
-		else if(require_all)
-			D.req_access = access_used.Copy()
-			D.req_one_access = null
-		else
-			D.req_access = null
-			D.req_one_access = access_used.Copy()
-
-		return
-
-	interact()
+/*
+	This is for the sandbox for now,
+	maybe useful later for an actual thing?
+	-Sayu
+*/
+
+/obj/structure/door_assembly
+	var/datum/airlock_maker/maker = null
+
+/obj/structure/door_assembly/attack_hand()
+	..()
+	if(maker)
+		maker.interact()
+
+/datum/airlock_maker
+	var/obj/structure/door_assembly/linked = null
+
+	var/list/access_used = null
+	var/require_all = 1
+
+	var/paintjob = "none"
+	var/glassdoor = 0
+
+	var/doorname = "airlock"
+
+/datum/airlock_maker/New(var/atom/target_loc)
+	linked = new(target_loc)
+	linked.maker = src
+	linked.anchored = FALSE
+	access_used = list()
+
+	interact()
+
+/datum/airlock_maker/proc/linkpretty(href,desc,active)
+	if(!desc)
+		var/static/list/defaults = list("No","Yes")
+		desc = defaults[active+1]
+	if(active)
+		return "<a href='?src=[REF(src)];[href]'><b>[desc]</b></a>"
+	return "<a href='?src=[REF(src)];[href]'><i>[desc]</i></a>"
+
+/datum/airlock_maker/proc/interact()
+	var/list/leftcolumn = list()
+	var/list/rightcolumn = list()
+	leftcolumn += "<u><b>Required Access</b></u>"
+	for(var/access in get_all_accesses())
+		leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used)
+	leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]"
+
+	rightcolumn += "<u><b>Paintjob</b></u>"
+	for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity"))
+		rightcolumn += linkpretty("paint=[option]",option,option == paintjob)
+	rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "<br><br>"
+	var/length = max(leftcolumn.len,rightcolumn.len)
+
+	var/dat = "You may move the model airlock around.  A new airlock will be built in its space when you click done, below.<hr><br>"
+	dat += "<a href='?src=[REF(src)];rename'>Door name</a>: \"[doorname]\""
+	dat += "<table>"
+	for(var/i=1; i<=length; i++)
+		dat += "<tr><td>"
+		if(i<=leftcolumn.len)
+			dat += leftcolumn[i]
+		dat += "</td><td>"
+		if(i<=rightcolumn.len)
+			dat += rightcolumn[i]
+		dat += "</td></tr>"
+
+	dat += "</table><hr><a href='?src=[REF(src)];done'>Finalize Airlock Construction</a> | <a href='?src=[REF(src)];cancel'>Cancel and Destroy Airlock</a>"
+	usr << browse(dat,"window=airlockmaker")
+
+/datum/airlock_maker/Topic(var/href,var/list/href_list)
+	if(!usr)
+		return
+	if(!src || !linked || !linked.loc)
+		usr << browse(null,"window=airlockmaker")
+		return
+
+	if("rename" in href_list)
+		var/newname = stripped_input(usr,"New airlock name:","Name the airlock",doorname)
+		if(newname)
+			doorname = newname
+	if("access" in href_list)
+		var/value = text2num(href_list["access"])
+		access_used ^= value
+	if("reqall" in href_list)
+		require_all = !require_all
+	if("paint" in href_list)
+		paintjob = href_list["paint"]
+	if("glass" in href_list)
+		glassdoor = !glassdoor
+
+	if("cancel" in href_list)
+		usr << browse(null,"window=airlockmaker")
+		qdel(linked)
+		qdel(src)
+		return
+
+	if("done" in href_list)
+		usr << browse(null,"window=airlockmaker")
+		var/turf/t_loc = linked.loc
+		qdel(linked)
+		if(!istype(t_loc))
+			return
+
+		var/target_type = "/obj/machinery/door/airlock"
+		if(glassdoor)
+			if(paintjob != "none")
+				if(paintjob in list("external","highsecurity","maintenance")) // no glass version
+					target_type += "/[paintjob]"
+				else
+					target_type += "/glass_[paintjob]"
+			else
+				target_type += "/glass"
+		else if(paintjob != "none")
+			target_type += "/[paintjob]"
+		var/final = target_type
+		target_type = text2path(final)
+		if(!target_type)
+			to_chat(usr, "Didn't work, contact Sayu with this: [final]")
+			usr << browse(null,"window=airlockmaker")
+			return
+
+		var/obj/machinery/door/D = new target_type(t_loc)
+
+		D.name = doorname
+
+		if(access_used.len == 0)
+			D.req_access = null
+			D.req_one_access = null
+		else if(require_all)
+			D.req_access = access_used.Copy()
+			D.req_one_access = null
+		else
+			D.req_access = null
+			D.req_one_access = access_used.Copy()
+
+		return
+
+	interact()

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -77,26 +77,26 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
 		hsbinfo = "<center><b>Sandbox Panel</b></center><hr>"
 		if(admin)
 			hsbinfo += "<b>Administration</b><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbtobj'>Toggle Object Spawning</a><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbtac'>Toggle Item Spawn Panel Auto-close</a><br>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbtobj'>Toggle Object Spawning</a><br>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbtac'>Toggle Item Spawn Panel Auto-close</a><br>"
 			hsbinfo += "<b>Canister Spawning</b><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/toxins]'>Spawn Plasma Canister</a><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/carbon_dioxide]'>Spawn CO2 Canister</a><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/nitrogen]'>Spawn Nitrogen Canister</a><br>"
-			hsbinfo += "- <a href='?src=\ref[src];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/nitrous_oxide]'>Spawn N2O Canister</a><hr>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/toxins]'>Spawn Plasma Canister</a><br>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/carbon_dioxide]'>Spawn CO2 Canister</a><br>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/nitrogen]'>Spawn Nitrogen Canister</a><br>"
+			hsbinfo += "- <a href='?src=[REF(src)];hsb=hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/nitrous_oxide]'>Spawn N2O Canister</a><hr>"
 		else
 			hsbinfo += "<i>Some item spawning may be disabled by the administrators.</i><br>"
 			hsbinfo += "<i>Only administrators may spawn dangerous canisters.</i><br>"
 		for(var/T in hrefs)
 			var/href = hrefs[T]
 			if(href)
-				hsbinfo += "- <a href='?\ref[src];hsb=[hrefs[T]]'>[T]</a><br>"
+				hsbinfo += "- <a href='?[REF(src)];hsb=[hrefs[T]]'>[T]</a><br>"
 			else
 				hsbinfo += "<br><b>[T]</b><br>"
 		hsbinfo += "<hr>"
-		hsbinfo += "- <a href='?\ref[src];hsb=hsbcloth'>Spawn Clothing...</a><br>"
-		hsbinfo += "- <a href='?\ref[src];hsb=hsbreag'>Spawn Reagent Container...</a><br>"
-		hsbinfo += "- <a href='?\ref[src];hsb=hsbobj'>Spawn Other Item...</a><br><br>"
+		hsbinfo += "- <a href='?[REF(src)];hsb=hsbcloth'>Spawn Clothing...</a><br>"
+		hsbinfo += "- <a href='?[REF(src)];hsb=hsbreag'>Spawn Reagent Container...</a><br>"
+		hsbinfo += "- <a href='?[REF(src)];hsb=hsbobj'>Spawn Other Item...</a><br><br>"
 
 	usr << browse(hsbinfo, "window=hsbpanel")
 
@@ -235,12 +235,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
 				if(!GLOB.hsboxspawn) return
 
 				if(!clothinfo)
-					clothinfo = "<b>Clothing</b> <a href='?\ref[src];hsb=hsbreag'>(Reagent Containers)</a> <a href='?\ref[src];hsb=hsbobj'>(Other Items)</a><hr><br>"
+					clothinfo = "<b>Clothing</b> <a href='?[REF(src)];hsb=hsbreag'>(Reagent Containers)</a> <a href='?[REF(src)];hsb=hsbobj'>(Other Items)</a><hr><br>"
 					var/list/all_items = subtypesof(/obj/item/clothing)
 					for(var/typekey in spawn_forbidden)
 						all_items -= typesof(typekey)
 					for(var/O in reverseRange(all_items))
-						clothinfo += "<a href='?src=\ref[src];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
+						clothinfo += "<a href='?src=[REF(src)];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
 
 				usr << browse(clothinfo,"window=sandbox")
 
@@ -249,12 +249,12 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
 				if(!GLOB.hsboxspawn) return
 
 				if(!reaginfo)
-					reaginfo = "<b>Reagent Containers</b> <a href='?\ref[src];hsb=hsbcloth'>(Clothing)</a> <a href='?\ref[src];hsb=hsbobj'>(Other Items)</a><hr><br>"
+					reaginfo = "<b>Reagent Containers</b> <a href='?[REF(src)];hsb=hsbcloth'>(Clothing)</a> <a href='?[REF(src)];hsb=hsbobj'>(Other Items)</a><hr><br>"
 					var/list/all_items = subtypesof(/obj/item/reagent_containers)
 					for(var/typekey in spawn_forbidden)
 						all_items -= typesof(typekey)
 					for(var/O in reverseRange(all_items))
-						reaginfo += "<a href='?src=\ref[src];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
+						reaginfo += "<a href='?src=[REF(src)];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
 
 				usr << browse(reaginfo,"window=sandbox")
 
@@ -263,13 +263,13 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
 				if(!GLOB.hsboxspawn) return
 
 				if(!objinfo)
-					objinfo = "<b>Other Items</b> <a href='?\ref[src];hsb=hsbcloth'>(Clothing)</a> <a href='?\ref[src];hsb=hsbreag'>(Reagent Containers)</a><hr><br>"
+					objinfo = "<b>Other Items</b> <a href='?[REF(src)];hsb=hsbcloth'>(Clothing)</a> <a href='?[REF(src)];hsb=hsbreag'>(Reagent Containers)</a><hr><br>"
 					var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers)
 					for(var/typekey in spawn_forbidden)
 						all_items -= typesof(typekey)
 
 					for(var/O in reverseRange(all_items))
-						objinfo += "<a href='?src=\ref[src];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
+						objinfo += "<a href='?src=[REF(src)];hsb=hsb_safespawn&path=[O]'>[O]</a><br>"
 
 				usr << browse(objinfo,"window=sandbox")
 

code/game/gamemodes/wizard/soulstone.dm

@@ -212,7 +212,7 @@
 /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null)
 	var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target)))
 	if(stoner)
-		newstruct.faction |= "\ref[stoner]"
+		newstruct.faction |= "[REF(stoner)]"
 		newstruct.master = stoner
 		var/datum/action/innate/seek_master/SM = new()
 		SM.Grant(newstruct)
@@ -244,7 +244,7 @@
 	S.key = T.key
 	S.language_holder = U.language_holder.copy(S)
 	if(U)
-		S.faction |= "\ref[U]" //Add the master as a faction, allowing inter-mob cooperation
+		S.faction |= "[REF(U)]" //Add the master as a faction, allowing inter-mob cooperation
 	if(U && iscultist(U))
 		SSticker.mode.add_cultist(S.mind, 0)
 	S.cancel_camera()

code/game/gamemodes/wizard/spellbook.dm

@@ -425,7 +425,7 @@
 
 /datum/spellbook_entry/item/warpwhistle
 	name = "Warp Whistle"
-	desc = "A strange whistle that will transport you to a distant safe place on the station. There is a window of vulnerability at the begining of every use."
+	desc = "A strange whistle that will transport you to a distant safe place on the station. There is a window of vulnerability at the beginning of every use."
 	item_path = /obj/item/warpwhistle
 	category = "Mobility"
 	cost = 1
@@ -652,7 +652,7 @@
 	var/list/cat_dat = list()
 	for(var/category in categories)
 		cat_dat[category] = "<hr>"
-		dat += "<li><a [tab==category?"class=selected":""] href='byond://?src=\ref[src];page=[category]'>[category]</a></li>"
+		dat += "<li><a [tab==category?"class=selected":""] href='byond://?src=[REF(src)];page=[category]'>[category]</a></li>"
 
 	dat += "<li><a><b>Points remaining : [uses]</b></a></li>"
 	dat += "</ul>"
@@ -663,11 +663,11 @@
 		E = entries[i]
 		spell_info += E.GetInfo()
 		if(E.CanBuy(user,src))
-			spell_info+= "<a href='byond://?src=\ref[src];buy=[i]'>[E.buy_word]</A><br>"
+			spell_info+= "<a href='byond://?src=[REF(src)];buy=[i]'>[E.buy_word]</A><br>"
 		else
 			spell_info+= "<span>Can't [E.buy_word]</span><br>"
 		if(E.CanRefund(user,src))
-			spell_info+= "<a href='byond://?src=\ref[src];refund=[i]'>Refund</A><br>"
+			spell_info+= "<a href='byond://?src=[REF(src)];refund=[i]'>Refund</A><br>"
 		spell_info += "<hr>"
 		if(cat_dat[E.category])
 			cat_dat[E.category] += spell_info