Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

code/datums/datumvars.dm

@@ -348,7 +348,7 @@ body
 		html += "[name] = <span class='value'>null</span>"
 
 	else if (istext(value))
-		html += "[name] = <span class='value'>\"[value]\"</span>"
+		html += "[name] = <span class='value'>\"[html_encode(value)]\"</span>"
 
 	else if (isicon(value))
 		#ifdef VARSICON
@@ -405,7 +405,7 @@ body
 				html += "</ul>"
 
 	else
-		html += "[name] = <span class='value'>[value]</span>"
+		html += "[name] = <span class='value'>[html_encode(value)]</span>"
 
 	html += "</li>"
 

code/datums/gas_mixture.dm

@@ -141,6 +141,7 @@ var/list/cached_gases_list = null
 			garbage_collect()
 
 			reacting = 1
+	/*
 	if(thermal_energy() > (PLASMA_BINDING_ENERGY*10))
 		if(procgases["plasma"] && procgases["co2"] && procgases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY && procgases["co2"][MOLES] > MINIMUM_HEAT_CAPACITY && (procgases["plasma"][MOLES]+procgases["co2"][MOLES])/total_moles() >= FUSION_PURITY_THRESHOLD)//Fusion wont occur if the level of impurities is too high.
 			//world << "pre [temperature, [procgases["plasma"][MOLES]], [procgases["co2"][MOLES]]
@@ -172,6 +173,7 @@ var/list/cached_gases_list = null
 					temperature = max(((temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB)
 					//Prevents whatever mechanism is causing it to hit negative temperatures.
 				//world << "post [temperature], [procgases["plasma"][MOLES]], [procgases["co2"][MOLES]]
+			*/
 
 	fuel_burnt = 0
 	if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)

code/datums/helper_datums/events.dm

@@ -34,7 +34,7 @@
 	//world << "Events in [args[1]] called"
 	var/list/event = listgetindex(events,args[1])
 	if(istype(event))
-		spawn(-1)
+		spawn(0)
 			for(var/datum/event/E in event)
 				if(!E.Fire(arglist(args.Copy(2))))
 					clearEvent(args[1],E)

code/datums/helper_datums/teleport.dm

@@ -82,12 +82,12 @@
 /datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound)
 	if(location)
 		if(effect)
-			spawn(-1)
+			spawn(0)
 				src = null
 				effect.attach(location)
 				effect.start()
 		if(sound)
-			spawn(-1)
+			spawn(0)
 				src = null
 				playsound(location,sound,60,1)
 	return

code/datums/modules.dm

@@ -1,62 +0,0 @@
-// module datum.
-// this is per-object instance, and shows the condition of the modules in the object
-// actual modules needed is referenced through modulestypes and the object type
-
-/datum/module
-	var/status				// bits set if working, 0 if broken
-	var/installed			// bits set if installed, 0 if missing
-
-// moduletypes datum
-// this is per-object type, and shows the modules needed for a type of object
-
-/datum/moduletypes
-	var/list/modcount = list()	// assoc list of the count of modules for a type
-
-
-var/list/modules = list(			// global associative list
-"/obj/machinery/power/apc" = "card_reader,power_control,id_auth,cell_power,cell_charge")
-
-
-/datum/module/New(var/obj/O)
-
-	var/type = O.type		// the type of the creating object
-
-	var/mneed = mods.inmodlist(type)		// find if this type has modules defined
-
-	if(!mneed)		// not found in module list?
-		qdel(src)	// delete self, thus ending proc
-
-	var/needed = mods.getbitmask(type)		// get a bitmask for the number of modules in this object
-	status = needed
-	installed = needed
-
-/datum/moduletypes/proc/addmod(type, modtextlist)
-	modules += type	// index by type text
-	modules[type] = modtextlist
-
-/datum/moduletypes/proc/inmodlist(type)
-	return ("[type]" in modules)
-
-/datum/moduletypes/proc/getbitmask(type)
-	var/count = modcount["[type]"]
-	if(count)
-		return 2**count-1
-
-	var/modtext = modules["[type]"]
-	var/num = 1
-	var/pos = 1
-
-	while(1)
-		pos = findtext(modtext, ",", pos, 0)
-		if(!pos)
-			break
-		else
-			pos++
-			num++
-
-	modcount += "[type]"
-	modcount["[type]"] = num
-
-	return 2**num-1
-
-

code/datums/spells/infinite_guns.dm

@@ -6,7 +6,7 @@
 	range = -1
 
 	school = "conjuration"
-	charge_max = 300
+	charge_max = 750
 	clothes_req = 1
 	cooldown_min = 10 //Gun wizard
 	action_icon_state = "bolt_action"

code/datums/uplink_item.dm

@@ -63,6 +63,7 @@ var/list/uplink_items = list()
 	var/list/gamemodes = list() // Empty list means it is in all the gamemodes. Otherwise place the gamemode name here.
 	var/list/excludefrom = list() //Empty list does nothing. Place the name of gamemode you don't want this item to be available in here. This is so you dont have to list EVERY mode to exclude something.
 	var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it)
+	var/refundable = FALSE
 
 /datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U)
 	if(item)
@@ -332,12 +333,7 @@ var/list/uplink_items = list()
 	cost = 25
 	gamemodes = list(/datum/game_mode/nuclear)
 	surplus = 0
-
-/datum/uplink_item/dangerous/reinforcement/spawn_item()
-	var/obj/item/weapon/antag_spawner/nuke_ops/T = ..()
-	if(istype(T))
-		T.TC_cost = cost
-
+	refundable = TRUE
 
 /datum/uplink_item/dangerous/guardian
 	name = "Holoparasites"
@@ -1049,7 +1045,7 @@ var/list/uplink_items = list()
 		buyable_items += temp_uplink_list[category]
 	var/list/bought_items = list()
 	U.uses -= cost
-	U.used_TC = 20
+	U.used_TC += 20
 	var/remaining_TC = 50
 
 	var/datum/uplink_item/I