Merge remote-tracking branch 'upstream/master' into advanced-camera-fixup

code/game/area/Space Station 13 areas.dm

@@ -53,7 +53,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/list/apc = list()
 	var/no_air = null
 //	var/list/lights				// list of all lights on this area
-	var/list/all_doors = list()		//Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area
 	var/air_doors_activated = 0
 
 	var/tele_proof = 0
@@ -107,14 +106,14 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Admin Room"
 	icon_state = "start"
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 
 /area/adminconstruction
 	name = "\improper Admin Testing Area"
 	icon_state = "start"
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/space
 	icon_state = "space"
@@ -467,7 +466,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "start"
 	requires_power = 0
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 	has_gravity = 1
 
 // === end remove
@@ -483,7 +482,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Centcom"
 	icon_state = "centcom"
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/centcom/control
 	name = "\improper Centcom Control"
@@ -564,7 +563,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Thunderdome"
 	icon_state = "thunder"
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 
 /area/tdome/arena_source
@@ -649,7 +648,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "yellow"
 	requires_power = 0
 	has_gravity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/wizard_station
 	name = "\improper Wizard's Den"
@@ -672,7 +671,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Vox Base"
 	icon_state = "yellow"
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 	no_teleportlocs = 1
 
 /area/vox_station/transit
@@ -1229,7 +1228,7 @@ var/list/ghostteleportlocs = list()
 /area/holodeck
 	name = "\improper Holodeck"
 	icon_state = "Holodeck"
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/holodeck/alphadeck
 	name = "\improper Holodeck Alpha"
@@ -1366,7 +1365,7 @@ var/list/ghostteleportlocs = list()
 
 /area/solar
 	requires_power = 0
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 	auxport
 		name = "\improper Fore Port Solar Array"
@@ -2281,25 +2280,25 @@ area/security/podbay
 	name = "\improper AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/turret_protected/AIsatextFS
 	name = "\improper AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/turret_protected/AIsatextAS
 	name = "\improper AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/turret_protected/AIsatextAP
 	name = "\improper AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 
 /area/turret_protected/NewAIMain
 	name = "\improper AI Main New"
@@ -2476,7 +2475,7 @@ area/security/podbay
 	name = "Beach"
 	icon_state = "beach"
 	luminosity = 1
-	lighting_use_dynamic = 0
+	dynamic_lighting = 0
 	requires_power = 0
 	ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg')
 

code/game/area/areas.dm

@@ -29,7 +29,7 @@
 	if(type == /area)	// override defaults for space. TODO: make space areas of type /area/space rather than /area
 		requires_power = 1
 		always_unpowered = 1
-		lighting_use_dynamic = 1
+		dynamic_lighting = 1
 		power_light = 0
 		power_equip = 0
 		power_environ = 0
@@ -80,26 +80,26 @@
 	return 0
 
 /area/proc/air_doors_close()
-	if(!src.air_doors_activated)
-		src.air_doors_activated = 1
-		for(var/obj/machinery/door/firedoor/E in src.all_doors)
-			if(!E.blocked)
-				if(E.operating)
-					E.nextstate = CLOSED
-				else if(!E.density)
+	if(!air_doors_activated)
+		air_doors_activated = 1
+		for(var/obj/machinery/door/firedoor/D in src)
+			if(!D.welded)
+				if(D.operating)
+					D.nextstate = CLOSED
+				else if(!D.density)
 					spawn(0)
-						E.close()
+						D.close()
 
 /area/proc/air_doors_open()
-	if(src.air_doors_activated)
-		src.air_doors_activated = 0
-		for(var/obj/machinery/door/firedoor/E in src.all_doors)
-			if(!E.blocked)
-				if(E.operating)
-					E.nextstate = OPEN
-				else if(E.density)
+	if(air_doors_activated)
+		air_doors_activated = 0
+		for(var/obj/machinery/door/firedoor/D in src)
+			if(!D.welded)
+				if(D.operating)
+					D.nextstate = OPEN
+				else if(D.density)
 					spawn(0)
-						E.open()
+						D.open()
 
 
 /area/proc/fire_alert()
@@ -145,46 +145,33 @@
 	if(!eject)
 		eject = 1
 		updateicon()
-	return
 
 /area/proc/readyreset()
 	if(eject)
 		eject = 0
 		updateicon()
-	return
 
 /area/proc/radiation_alert()
 	if(!radalert)
 		radalert = 1
 		updateicon()
-	return
 
 /area/proc/reset_radiation_alert()
 	if(radalert)
 		radalert = 0
 		updateicon()
-	return
 
 /area/proc/partyalert()
-	if(!( party ))
+	if(!party)
 		party = 1
 		updateicon()
 		mouse_opacity = 0
-	return
 
 /area/proc/partyreset()
 	if(party)
 		party = 0
 		mouse_opacity = 0
 		updateicon()
-		for(var/obj/machinery/door/firedoor/D in src)
-			if(!D.blocked)
-				if(D.operating)
-					D.nextstate = OPEN
-				else if(D.density)
-					spawn(0)
-						D.open()
-	return
 
 /area/proc/updateicon()
 	if(radalert) // always show the radiation alert, regardless of power

code/game/asteroid.dm

@@ -88,7 +88,7 @@ var/global/max_secret_rooms = 6
 			theme = "cavein"
 			walltypes = list(/turf/simulated/mineral/random/high_chance=1)
 			floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand)
-			treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/weapon/pickaxe/drill/diamonddrill=2,/obj/item/weapon/gun/energy/kinetic_accelerator/hyper=1,
+			treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/weapon/pickaxe/drill/diamonddrill=2,
 							/obj/item/weapon/resonator/upgraded=1, /obj/item/weapon/pickaxe/drill/jackhammer=5)
 			fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1,
 							  /obj/item/weapon/reagent_containers/food/snacks/grown/chili=1,/obj/item/weapon/tank/oxygen/red=2)

code/game/atoms.dm

@@ -36,7 +36,7 @@
 	var/list/original_atom
 
 	var/allow_spin = 1 //Set this to 1 for a _target_ that is being thrown at; if an atom has this set to 1 then atoms thrown AT it will not spin; currently used for the singularity. -Fox
-	
+
 	var/admin_spawned = 0	//was this spawned by an admin? used for stat tracking stuff.
 
 /atom/proc/onCentcom()
@@ -81,6 +81,10 @@
 		reagents = null
 	invisibility = 101
 	return ..()
+	
+//Hook for running code when a dir change occurs
+/atom/proc/setDir(newdir)
+	dir = newdir
 
 /atom/proc/CheckParts(list/parts_list)
 	for(var/A in parts_list)
@@ -222,11 +226,6 @@
 /atom/proc/relaymove()
 	return
 
-//called to set the atom's dir and used to add behaviour to dir-changes - Not fully used (yet)
-/atom/proc/set_dir(new_dir)
-	. = new_dir != dir
-	dir = new_dir
-
 /atom/proc/ex_act()
 	return
 
@@ -469,4 +468,5 @@
 
 /atom/on_varedit(modified_var)
 	if(!Debug2)
-		admin_spawned = TRUE
+		admin_spawned = TRUE
+	..()

code/game/atoms_movable.dm

@@ -32,7 +32,13 @@
 /atom/movable/Destroy()
 	for(var/atom/movable/AM in contents)
 		qdel(AM)
+	var/turf/un_opaque
+	if(opacity && isturf(loc))
+		un_opaque = loc
+
 	loc = null
+	if(un_opaque)
+		un_opaque.recalc_atom_opacity()
 	if(pulledby)
 		if(pulledby.pulling == src)
 			pulledby.pulling = null

code/game/dna/genes/disabilities.dm

@@ -115,6 +115,24 @@
 /datum/dna/gene/disability/blindness/New()
 	block=BLINDBLOCK
 
+/datum/dna/gene/disability/colourblindness
+	name = "Colourblindness"
+	activation_message = "You feel a peculiar prickling in your eyes while your perception of colour changes."
+	deactivation_message ="Your eyes tingle unsettlingly, though everything seems to become alot more colourful."
+	instability = -GENE_INSTABILITY_MODERATE
+	disability = COLOURBLIND
+
+/datum/dna/gene/disability/colourblindness/New()
+	block=COLOURBLINDBLOCK
+
+/datum/dna/gene/disability/colourblindness/activate(var/mob/M, var/connected, var/flags)
+	..()
+	M.update_client_colour() //Handle the activation of the colourblindness on the mob.
+
+/datum/dna/gene/disability/colourblindness/deactivate(var/mob/M, var/connected, var/flags)
+	..()
+	M.update_client_colour() //Handle the deactivation of the colourblindness on the mob.
+
 /datum/dna/gene/disability/deaf
 	name="Deafness"
 	activation_message="It's kinda quiet."
@@ -126,7 +144,7 @@
 	block=DEAFBLOCK
 
 /datum/dna/gene/disability/deaf/activate(var/mob/M, var/connected, var/flags)
-	..(M,connected,flags)
+	..()
 	M.EarDeaf(1)
 
 /datum/dna/gene/disability/nearsighted
@@ -139,7 +157,6 @@
 /datum/dna/gene/disability/nearsighted/New()
 	block=GLASSESBLOCK
 
-
 /datum/dna/gene/disability/lisp
 	name = "Lisp"
 	desc = "I wonder wath thith doeth."

code/game/dna/genes/goon_powers.dm

@@ -57,12 +57,7 @@
 	var/turf/simulated/T = get_turf(M)
 	if(!istype(T))
 		return
-	var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-	var/light_available
-	if(L)
-		light_available = L.get_clamped_lum()*10
-	else
-		light_available = 5
+	var/light_available = T.get_lumcount() * 10
 	if(light_available <= 2)
 		M.alpha = round(M.alpha * 0.8)
 	else

code/game/gamemodes/changeling/powers/absorb.dm

@@ -1,3 +1,5 @@
+#define LING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
+
 /obj/effect/proc_holder/changeling/absorbDNA
 	name = "Absorb DNA"
 	desc = "Absorb the DNA of our victim."
@@ -26,8 +28,6 @@
 	var/mob/living/carbon/target = G.affecting
 	return changeling.can_absorb_dna(user,target)
 
-
-
 /obj/effect/proc_holder/changeling/absorbDNA/sting_action(var/mob/user)
 	var/datum/changeling/changeling = user.mind.changeling
 	var/obj/item/weapon/grab/G = user.get_active_hand()
@@ -63,7 +63,25 @@
 
 	if(target.mind)//if the victim has got a mind
 
-		target.mind.show_memory(src, 0) //I can read your mind, kekeke. Output all their notes.
+		target.mind.show_memory(user, 0) //I can read your mind, kekeke. Output all their notes.
+
+		//Some of target's recent speech, so the changeling can attempt to imitate them better.
+		//Recent as opposed to all because rounds tend to have a LOT of text.
+		var/list/recent_speech = list()
+
+		if(target.say_log.len > LING_ABSORB_RECENT_SPEECH)
+			recent_speech = target.say_log.Copy(target.say_log.len-LING_ABSORB_RECENT_SPEECH+1,0) //0 so len-LING_ARS+1 to end of list
+		else
+			recent_speech = target.say_log.Copy()
+
+		if(recent_speech.len)
+			user.mind.store_memory("<B>Some of [target]'s speech patterns, we should study these to better impersonate them!</B>")
+			to_chat(user, "<span class='boldnotice'>Some of [target]'s speech patterns, we should study these to better impersonate them!</span>")
+			for(var/spoken_memory in recent_speech)
+				user.mind.store_memory("\"[spoken_memory]\"")
+				to_chat(user, "<span class='notice'>\"[spoken_memory]\"</span>")
+			user.mind.store_memory("<B>We have no more knowledge of [target]'s speech patterns.</B>")
+			to_chat(user, "<span class='boldnotice'>We have no more knowledge of [target]'s speech patterns.</span>")
 
 		if(target.mind.changeling)//If the target was a changeling, suck out their extra juice and objective points!
 			changeling.chem_charges += min(target.mind.changeling.chem_charges, changeling.chem_storage)
@@ -72,7 +90,6 @@
 			target.mind.changeling.absorbed_dna.len = 1
 			target.mind.changeling.absorbedcount = 0
 
-
 	changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage)
 
 	changeling.isabsorbing = 0
@@ -82,8 +99,6 @@
 	target.Drain()
 	return 1
 
-
-
 //Absorbs the target DNA.
 /datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user)
 	T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set.
@@ -104,3 +119,5 @@
 			return
 	absorbed_dna |= new_dna
 	trim_dna()
+
+#undef LING_ABSORB_RECENT_SPEECH

code/game/gamemodes/changeling/powers/humanform.dm

@@ -24,15 +24,18 @@
 	if(!user)
 		return 0
 	to_chat(user, "<span class='notice'>We transform our appearance.</span>")
-	user.dna.SetSEState(MONKEYBLOCK,0)
-	domutcheck(user, null) // Do a pre-mutcheck to cleanly switch from monkey form.
-	user.dna = chosen_dna
+	user.dna.SetSEState(MONKEYBLOCK,0,1)
+	genemutcheck(user,MONKEYBLOCK,null,MUTCHK_FORCED)
+	user.dna = chosen_dna.Clone()
 	user.real_name = chosen_dna.real_name
+	if(istype(user))
+		user.set_species(chosen_dna.species)
+	domutcheck(user,null,MUTCHK_FORCED)
 	user.flavor_text = ""
-	if(ishuman(user))
-		user.set_species()
+	user.dna.UpdateSE()
+	user.dna.UpdateUI()
+	user.sync_organ_dna(1)
 	user.UpdateAppearance()
-	domutcheck(user, null)
 
 	changeling.purchasedpowers -= src
 	//O.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/lesserform(null)

code/game/gamemodes/changeling/powers/lesserform.dm

@@ -21,6 +21,7 @@
 		to_chat(H, "<span class='warning'>We cannot perform this ability in this form!</span>")
 		return
 
+	user.dna = user.dna.Clone()
 	H.visible_message("<span class='warning'>[H] transforms!</span>")
 	changeling.geneticdamage = 30
 	to_chat(H, "<span class='warning'>Our genes cry out!</span>")

code/game/gamemodes/changeling/powers/transform.dm

@@ -16,12 +16,15 @@
 		return
 	user.dna = chosen_dna.Clone()
 	user.real_name = chosen_dna.real_name
-	user.flavor_text = ""
 	if(ishuman(user))
-		user.set_species()
+		user.set_species(chosen_dna.species)
+	domutcheck(user, null, MUTCHK_FORCED) //Ensures species that get powers by the species proc handle_dna keep them
+	user.flavor_text = ""
+	user.dna.UpdateSE()
+	user.dna.UpdateUI()
+	user.sync_organ_dna(1)
 	user.UpdateAppearance()
-	domutcheck(user, null)
-	
+
 	user.changeling_update_languages(changeling.absorbed_languages)
 
 	feedback_add_details("changeling_powers","TR")

code/game/gamemodes/miniantags/slaughter/slaughter.dm

@@ -193,10 +193,9 @@
 	return ..()
 
 /datum/action/innate/demon/whisper/proc/choose_targets(mob/user = usr)//yes i am copying from telepathy..hush...
-	var/list/targets = new /list()
-	var/list/validtargets = new /list()
-	for(var/mob/M in view(user.client.view, user))
-		if(M && M.mind)
+	var/list/validtargets = list()
+	for(var/mob/living/M in view(user.client.view, get_turf(user)))
+		if(M && M.mind && M.stat != DEAD)
 			if(M == user)
 				continue
 
@@ -206,15 +205,12 @@
 		to_chat(usr, "<span class='warning'>There are no valid targets!</span>")
 		return
 
-	targets += input("Choose the target to talk to.", "Targeting") as null|mob in validtargets
-
-	if(!targets.len || !targets[1])
-		return
+	var/mob/living/target = input("Choose the target to talk to.", "Targeting") as null|mob in validtargets
+	return target
 
 /datum/action/innate/demon/whisper/Activate()
-	var/list/choice = choose_targets()
-
-	if(!choice.len)
+	var/mob/living/choice = choose_targets()
+	if(!choice)
 		return
 
 	var/msg = stripped_input(usr, "What do you wish to tell [choice]?", null, "")

code/game/gamemodes/objective.dm

@@ -192,19 +192,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \
 	if(shuttle_master.emergency.areaInstance != A)
 		return 0
 
-	for(var/mob/living/player in player_list)
-		if(player.mind && player.mind != owner)
-			if(player.stat != DEAD)
-				if(issilicon(player)) //Borgs are technically dead anyways
-					continue
-				if(isanimal(player)) //Poly does not own the shuttle
-					continue
-				if(player.mind.special_role && !(player.mind.special_role == SPECIAL_ROLE_ERT)) //Is antag, and not ERT
-					continue
-
-				if(get_area(player) == A)
-					return 0
-	return 1
+	return shuttle_master.emergency.is_hijacked()
 
 /datum/objective/hijackclone
 	explanation_text = "Hijack the emergency shuttle by ensuring only you (or your copies) escape."

code/game/gamemodes/setupgame.dm

@@ -35,6 +35,7 @@
 
 	// Standard muts
 	BLINDBLOCK         = getAssignedBlock("BLIND",         numsToAssign)
+	COLOURBLINDBLOCK   = getAssignedBlock("COLOURBLIND",   numsToAssign)
 	DEAFBLOCK          = getAssignedBlock("DEAF",          numsToAssign)
 	HULKBLOCK          = getAssignedBlock("HULK",          numsToAssign, DNA_HARD_BOUNDS, good=1)
 	TELEBLOCK          = getAssignedBlock("TELE",          numsToAssign, DNA_HARD_BOUNDS, good=1)

code/game/gamemodes/shadowling/shadowling_abilities.dm

@@ -84,8 +84,8 @@
 			P.visible_message("<span class='danger'>[P]'s light fades and turns off.</span>")
 	else if(istype(I, /obj/item/weapon/gun))
 		var/obj/item/weapon/gun/G = I
-		if(G.F)
-			var/obj/item/device/flashlight/F = G.F
+		if(G.gun_light)
+			var/obj/item/device/flashlight/F = G.gun_light
 			if(F.on)
 				G.toggle_gunlight()
 				G.visible_message("<span class='danger'>[G]'s light fades and turns off.</span>")

code/game/gamemodes/vampire/vampire.dm

@@ -416,12 +416,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 		owner.alpha = 255
 		return
 	var/turf/simulated/T = get_turf(owner)
-	var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-	var/light_available
-	if(L)
-		light_available = L.get_clamped_lum(0.5) * 10
-	else
-		light_available = 10
+	var/light_available = T.get_lumcount(0.5) * 10
 
 	if(!istype(T))
 		return 0
@@ -429,6 +424,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 	if(!iscloaking)
 		owner.alpha = 255
 		return 0
+
 	if(light_available <= 2)
 		owner.alpha = round((255 * 0.15))
 		return 1

code/game/gamemodes/vampire/vampire_powers.dm

@@ -479,8 +479,7 @@
 		if(T.y > world.maxy-outer_tele_radius || T.y < outer_tele_radius)
 			continue
 
-		var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-		var/lightingcount = L.get_clamped_lum(0.5) * 10
+		var/lightingcount = T.get_lumcount(0.5) * 10
 
 		// LIGHTING CHECK
 		if(lightingcount > max_lum)

code/game/gamemodes/wizard/artefact.dm

@@ -786,6 +786,7 @@ var/global/list/multiverse = list()
 			GiveHint(target)
 		cooldown = world.time +cooldown_time
 		return
+
 	if(!link)
 		if(I.loc == user && istype(I) && I.w_class <= 2)
 			user.drop_item()
@@ -794,13 +795,17 @@ var/global/list/multiverse = list()
 			to_chat(user, "You attach [I] to the doll.")
 			update_targets()
 	..()
+
 /obj/item/voodoo/check_eye(mob/user as mob)
-	return src.loc == user
+	if(loc != user)
+		user.reset_perspective(null)
+		user.unset_machine()
 
 /obj/item/voodoo/attack_self(mob/user as mob)
 	if(!target && possible.len)
 		target = input(user, "Select your victim!", "Voodoo") as null|anything in possible
 		return
+
 	if(user.zone_sel.selecting == "chest")
 		if(link)
 			target = null
@@ -809,6 +814,7 @@ var/global/list/multiverse = list()
 			link = null
 			update_targets()
 			return
+
 	if(target && cooldown < world.time)
 		switch(user.zone_sel.selecting)
 			if("mouth")

code/game/gamemodes/wizard/godhand.dm

@@ -32,6 +32,11 @@
 	attached_spell.attached_hand = null
 	qdel(src)
 
+/obj/item/weapon/melee/touch_attack/dropped()
+	if(attached_spell)
+		attached_spell.attached_hand = null
+	qdel(src)
+
 /obj/item/weapon/melee/touch_attack/disintegrate
 	name = "disintegrating touch"
 	desc = "This hand of mine glows with an awesome power!"

code/game/gamemodes/wizard/rightandwrong.dm

@@ -1,7 +1,7 @@
 
 
 /mob/proc/rightandwrong(var/summon_type) //0 = Summon Guns, 1 = Summon Magic
-	var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","arg","uzi","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","grenadelauncher","medibeam")
+	var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","arg","uzi","turret","pulsecarbine","decloner","mindflayer","kinetic","advplasmacutter","wormhole","wt550","grenadelauncher","medibeam")
 	var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffhealing", "armor", "scrying", "staffdoor", "special","voodoo","special")
 	var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos","necromantic")
 
@@ -76,8 +76,8 @@
 					new /obj/item/weapon/gun/energy/decloner(get_turf(H))
 				if("mindflayer")
 					new /obj/item/weapon/gun/energy/mindflayer(get_turf(H))
-				if("hyperkinetic")
-					new /obj/item/weapon/gun/energy/kinetic_accelerator/hyper(get_turf(H))
+				if("kinetic")
+					new /obj/item/weapon/gun/energy/kinetic_accelerator(get_turf(H))
 				if("advplasmacutter")
 					new /obj/item/weapon/gun/energy/plasmacutter/adv(get_turf(H))
 				if("wormhole")

code/game/gamemodes/wizard/soulstone.dm

@@ -8,84 +8,118 @@
 	slot_flags = SLOT_BELT
 	origin_tech = "bluespace=4;materials=4"
 	var/imprinted = "empty"
+	
+	var/usability = TRUE // Can this soul stone be used by anyone, or only cultists/wizards?
+	var/reusable = TRUE // Can this soul stone be used more than once?
+	var/spent = FALSE // If the soul stone can only be used once, has it been used?
 
+/obj/item/device/soulstone/proc/can_use(mob/living/user)
+	if(iscultist(user) || iswizard(user) || usability)
+		return TRUE
 
-//////////////////////////////Capturing////////////////////////////////////////////////////////
+	return FALSE
+	
+/obj/item/device/soulstone/proc/was_used()
+	if(!reusable)
+		spent = TRUE
+		name = "dull [name]"
+		desc = "A fragment of the legendary treasure known simply as \
+			the 'Soul Stone'. The shard lies still, dull and lifeless; \
+			whatever spark it once held long extinguished."
+			
+/obj/item/device/soulstone/anybody
+	usability = TRUE
 
-	attack(mob/living/carbon/human/M as mob, mob/user as mob)
-		if(!istype(M, /mob/living/carbon/human))//If target is not a human.
-			return ..()
-		if(istype(M, /mob/living/carbon/human/dummy))
-			return ..()
-
-		if(M.has_brain_worms()) //Borer stuff - RR
-			to_chat(user, "<span class='warning'>This being is corrupted by an alien intelligence and cannot be soul trapped.</span>")
-			return ..()
-
-		if(jobban_isbanned(M, "cultist") || jobban_isbanned(M, "Syndicate"))
-			to_chat(user, "<span class='warning'>A mysterious force prevents you from trapping this being's soul.</span>")
-			return ..()
-
-		M.create_attack_log("<font color='orange'>Has had their soul captured with [src.name] by [key_name(user)]</font>")
-		user.create_attack_log("<font color='red'>Used the [src.name] to capture the soul of [key_name(M)]</font>")
-
-		log_attack("<font color='red'>[key_name(user)] used the [src.name] to capture the soul of [key_name(M)]</font>")
-
-
-		transfer_soul("VICTIM", M, user)
+/obj/item/device/soulstone/anybody/chaplain
+	name = "mysterious old shard"
+	reusable = FALSE
+	
+/obj/item/device/soulstone/pickup(mob/living/user)
+	..()
+	if(!can_use(user))
+		to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.</span>")
+		user.Dizzy(120)
+		
+//////////////////////////////Capturing////////////////////////////////////////////////////////		
+/obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+	if(!can_use(user))
+		user.Paralyse(5)
+		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
 		return
 
-	/*attack(mob/living/simple_animal/shade/M as mob, mob/user as mob)//APPARENTLY THEY NEED THEIR OWN SPECIAL SNOWFLAKE CODE IN THE LIVING ANIMAL DEFINES
-		if(!istype(M, /mob/living/simple_animal/shade))//If target is not a shade
-			return ..()
-		user.create_attack_log("<font color='red'>Used the [src.name] to capture the soul of [M.name] ([M.ckey])</font>")
-
-		transfer_soul("SHADE", M, user)
-		return*/
-///////////////////Options for using captured souls///////////////////////////////////////
-
-	attack_self(mob/user)
-		if(!in_range(src, user))
-			return
-		user.set_machine(src)
-		var/dat = "<TT><B>Soul Stone</B><BR>"
-		for(var/mob/living/simple_animal/shade/A in src)
-			dat += "Captured Soul: [A.name]<br>"
-			dat += {"<A href='byond://?src=[UID()];choice=Summon'>Summon Shade</A>"}
-			dat += "<br>"
-			dat += {"<a href='byond://?src=[UID()];choice=Close'> Close</a>"}
-		user << browse(dat, "window=aicard")
-		onclose(user, "aicard")
+	if(spent)
+		to_chat(user, "<span class='warning'>There is no power left in the shard.</span>")
 		return
 
+	if(!ishuman(M) || istype(M, /mob/living/carbon/human/dummy)) //If target is not a human or a dummy
+		return ..()
+		
+	if(M.has_brain_worms()) //Borer stuff - RR
+		to_chat(user, "<span class='warning'>This being is corrupted by an alien intelligence and cannot be soul trapped.</span>")
+		return ..()
 
+	if(jobban_isbanned(M, "cultist") || jobban_isbanned(M, "Syndicate"))
+		to_chat(user, "<span class='warning'>A mysterious force prevents you from trapping this being's soul.</span>")
+		return ..()
 
+	M.create_attack_log("<font color='orange'>Has had their soul captured with [src.name] by [key_name(user)]</font>")
+	user.create_attack_log("<font color='red'>Used the [src.name] to capture the soul of [key_name(M)]</font>")
+	log_attack("<font color='red'>[key_name(user)] used the [src.name] to capture the soul of [key_name(M)]</font>")
 
-	Topic(href, href_list)
-		var/mob/U = usr
-		if(!in_range(src, U)||U.machine!=src)
+	transfer_soul("VICTIM", M, user)
+	return
+
+///////////////////Options for using captured souls///////////////////////////////////////	
+/obj/item/device/soulstone/attack_self(mob/user)
+	if(!in_range(src, user))
+		return
+
+	if(!can_use(user))
+		user.Paralyse(5)
+		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
+		return		
+		
+	user.set_machine(src)
+	var/dat = "<TT><B>Soul Stone</B><BR>"
+	for(var/mob/living/simple_animal/shade/A in src)
+		dat += "Captured Soul: [A.name]<br>"
+		dat += {"<A href='byond://?src=[UID()];choice=Summon'>Summon Shade</A>"}
+		dat += "<br>"
+		dat += {"<a href='byond://?src=[UID()];choice=Close'> Close</a>"}
+	user << browse(dat, "window=aicard")
+	onclose(user, "aicard")
+	return
+
+/obj/item/device/soulstone/Topic(href, href_list)
+	var/mob/U = usr
+	if(!in_range(src, U) || U.machine != src || !can_use(usr))
+		U << browse(null, "window=aicard")
+		U.unset_machine()
+		return
+
+	add_fingerprint(U)
+	U.set_machine(src)
+
+	switch(href_list["choice"])//Now we switch based on choice.
+		if("Close")
 			U << browse(null, "window=aicard")
 			U.unset_machine()
 			return
 
-		add_fingerprint(U)
-		U.set_machine(src)
-
-		switch(href_list["choice"])//Now we switch based on choice.
-			if("Close")
-				U << browse(null, "window=aicard")
-				U.unset_machine()
-				return
-
-			if("Summon")
-				for(var/mob/living/simple_animal/shade/A in src)
-					A.status_flags &= ~GODMODE
-					A.canmove = 1
-					to_chat(A, "<b>You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs.</b>")
-					A.loc = U.loc
-					A.cancel_camera()
-					src.icon_state = "soulstone"
-		attack_self(U)
+		if("Summon")
+			for(var/mob/living/simple_animal/shade/A in src)
+				A.status_flags &= ~GODMODE
+				A.canmove = 1
+				A.forceMove(get_turf(usr))
+				A.cancel_camera()
+				icon_state = "soulstone"
+				name = initial(name)
+				if(iswizard(usr) || usability)
+					to_chat(A, "<b>You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help them succeed in their goals at all costs.</b>")
+				else if(iscultist(usr))
+					to_chat(A, "<b>You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.</b>")
+				was_used()
+	attack_self(U)
 
 ///////////////////////////Transferring to constructs/////////////////////////////////////////////////////
 /obj/structure/constructshell
@@ -93,15 +127,30 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "construct"
 	desc = "A wicked machine used by those skilled in magical arts. It is inactive"
+	
+/obj/structure/constructshell/examine(mob/user)
+	if(..(user, 0))
+		if(iscultist(user) || iswizard(user) || user.stat == DEAD)
+			to_chat(user, "<span class='cult'>A construct shell, used to house bound souls from a soulstone.</span>")
+			to_chat(user, "<span class='cult'>Placing a soulstone with a soul into this shell allows you to produce your choice of the following:</span>")
+			to_chat(user, "<span class='cult'>An <b>Artificer</b>, which can produce <b>more shells and soulstones</b>, as well as fortifications.</span>")
+			to_chat(user, "<span class='cult'>A <b>Wraith</b>, which does high damage and can jaunt through walls, though it is quite fragile.</span>")
+			to_chat(user, "<span class='cult'>A <b>Juggernaut</b>, which is very hard to kill and can produce temporary walls, but is slow.</span>")
 
 /obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob, params)
 	if(istype(O, /obj/item/device/soulstone))
-		O.transfer_soul("CONSTRUCT",src,user)
-
+		var/obj/item/device/soulstone/SS = O
+		if(!SS.can_use(user))
+			to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.</span>")
+			user.Dizzy(120)
+			return
+		SS.transfer_soul("CONSTRUCT",src,user)
+		SS.was_used()
+	else
+		return ..()
 
 ////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
 
-
 /obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob).
 	switch(choice)
 		if("FORCE")
@@ -238,7 +287,6 @@
 		to_chat(newstruct, "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>")
 	newstruct.cancel_camera()
 
-
 /obj/item/device/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
 	new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton
 	T.invisibility = 101
@@ -268,7 +316,6 @@
 	if(vic && U)
 		to_chat(U, "<span class='info'><b>Capture successful!</b>:</span> [T.real_name]'s soul has been ripped from their body and stored within the soul stone.")
 
-
 /obj/item/device/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
 	var/mob/dead/observer/chosen_ghost
 

code/game/gamemodes/wizard/spellbook.dm

@@ -848,7 +848,6 @@
 	to_chat(user, "<span class='warning'>[src] suddenly vanishes!</span>")
 	qdel(src)
 
-
 /obj/item/weapon/spellbook/oneuse/fake_gib
 	spell = /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate
 	spellname = "disintegrate"

code/game/jobs/job_controller.dm

@@ -51,6 +51,8 @@ var/global/datum/controller/occupations/job_master
 			if(!job)	return 0
 			if(jobban_isbanned(player, rank))	return 0
 			if(!job.player_old_enough(player.client)) return 0
+			if(job.available_in_playtime(player.client))
+				return 0
 			if(!is_job_whitelisted(player, rank)) return 0
 			var/position_limit = job.total_positions
 			if(!latejoin)
@@ -87,13 +89,16 @@ var/global/datum/controller/occupations/job_master
 		Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
 		var/list/candidates = list()
 		for(var/mob/new_player/player in unassigned)
-			Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
+			Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
 			if(jobban_isbanned(player, job.title))
 				Debug("FOC isbanned failed, Player: [player]")
 				continue
 			if(!job.player_old_enough(player.client))
 				Debug("FOC player not old enough, Player: [player]")
 				continue
+			if(job.available_in_playtime(player.client))
+				Debug("FOC player not enough playtime, Player: [player]")
+				continue
 			if(flag && !(flag in player.client.prefs.be_special))
 				Debug("FOC flag failed, Player: [player], Flag: [flag], ")
 				continue
@@ -123,9 +128,6 @@ var/global/datum/controller/occupations/job_master
 			if(job.admin_only) // No admin positions either.
 				continue
 
-			if(job.available_in_playtime(player.client))
-				continue
-
 			if(jobban_isbanned(player, job.title))
 				Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
 				continue
@@ -134,6 +136,10 @@ var/global/datum/controller/occupations/job_master
 				Debug("GRJ player not old enough, Player: [player]")
 				continue
 
+			if(job.available_in_playtime(player.client))
+				Debug("GRJ player not enough playtime, Player: [player]")
+				continue
+
 			if(player.mind && job.title in player.mind.restricted_roles)
 				Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
 				continue
@@ -313,6 +319,10 @@ var/global/datum/controller/occupations/job_master
 						Debug("DO player not old enough, Player: [player], Job:[job.title]")
 						continue
 
+					if(job.available_in_playtime(player.client))
+						Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
+						continue
+
 					if(player.mind && job.title in player.mind.restricted_roles)
 						Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
 						continue
@@ -674,6 +684,9 @@ var/global/datum/controller/occupations/job_master
 				if(!job.player_old_enough(player.client))
 					level6++
 					continue
+				if(job.available_in_playtime(player.client))
+					level6++
+					continue
 				if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
 					level1++
 				else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)

code/game/machinery/adv_med.dm

@@ -453,6 +453,7 @@
 		occupantData["intOrgan"] = intOrganData
 
 		occupantData["blind"] = (H.disabilities & BLIND)
+		occupantData["colourblind"] = (H.disabilities & COLOURBLIND)
 		occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
 
 	data["occupant"] = occupantData
@@ -639,6 +640,8 @@
 			dat += "</table>"
 			if(occupant.disabilities & BLIND)
 				dat += "<font color='red'>Cataracts detected.</font><BR>"
+			if(occupant.disabilities & COLOURBLIND)
+				dat += "<font color='red'>Photoreceptor abnormalities detected.</font><BR>"
 			if(occupant.disabilities & NEARSIGHTED)
 				dat += "<font color='red'>Retinal misalignment detected.</font><BR>"
 		else

code/game/machinery/alarm.dm

@@ -572,34 +572,6 @@
 
 	frequency.post_signal(src, alert_signal)
 
-/obj/machinery/alarm/proc/air_doors_close(manual)
-	var/area/A = get_area(src)
-	if(!A.air_doors_activated)
-		A.air_doors_activated = 1
-		for(var/obj/machinery/door/E in A.all_doors)
-			if(istype(E,/obj/machinery/door/firedoor))
-				if(!E:blocked)
-					if(E.operating)
-						E:nextstate = CLOSED
-					else if(!E.density)
-						spawn(0)
-							E.close()
-				continue
-
-/obj/machinery/alarm/proc/air_doors_open(manual)
-	var/area/A = get_area(loc)
-	if(A.air_doors_activated)
-		A.air_doors_activated = 0
-		for(var/obj/machinery/door/E in A.all_doors)
-			if(istype(E, /obj/machinery/door/firedoor))
-				if(!E:blocked)
-					if(E.operating)
-						E:nextstate = OPEN
-					else if(E.density)
-						spawn(0)
-							E.open()
-				continue
-
 ///////////////
 //END HACKING//
 ///////////////

code/game/machinery/constructable_frame.dm

@@ -757,6 +757,17 @@ obj/item/weapon/circuitboard/rdserver
 							/obj/item/stack/cable_coil = 1,
 							/obj/item/weapon/stock_parts/console_screen = 1)
 
+/obj/item/weapon/circuitboard/quantumpad
+	name = "circuit board (Quantum Pad)"
+	build_path = /obj/machinery/quantumpad
+	board_type = "machine"
+	origin_tech = "programming=3;engineering=3;plasmatech=3;bluespace=4"
+	frame_desc = "Requires 1 Bluespace Crystal, 1 Capacitor, 1 piece of cable and 1 Manipulator."
+	req_components = list(
+							/obj/item/weapon/ore/bluespace_crystal = 1,
+							/obj/item/weapon/stock_parts/capacitor = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/stack/cable_coil = 1)
 
 /obj/item/weapon/circuitboard/sleeper
 	name = "circuit board (Sleeper)"

code/game/machinery/doors/firedoor.dm

@@ -1,9 +1,15 @@
+#define CONSTRUCTION_COMPLETE 0 //No construction done - functioning as normal
+#define CONSTRUCTION_PANEL_OPEN 1 //Maintenance panel is open, still functioning
+#define CONSTRUCTION_WIRES_EXPOSED 2 //Cover plate is removed, wires are available
+#define CONSTRUCTION_GUTTED 3 //Wires are removed, circuit ready to remove
+#define CONSTRUCTION_NOCIRCUIT 4 //Circuit board removed, can safely weld apart
+
 /var/const/OPEN = 1
 /var/const/CLOSED = 2
 
 /obj/machinery/door/firedoor
-	name = "Firelock"
-	desc = "Apply crowbar"
+	name = "firelock"
+	desc = "Apply crowbar."
 	icon = 'icons/obj/doors/Doorfireglass.dmi'
 	icon_state = "door_open"
 	opacity = 0
@@ -11,47 +17,21 @@
 	heat_proof = 1
 	glass = 1
 	power_channel = ENVIRON
-
-	var/list/areas_added
-
-	var/blocked = 0
-	var/nextstate = null
-
-	var/logged_users
 	closed_layer = 3.11
 
-/obj/machinery/door/firedoor/New()
-	. = ..()
-	for(var/obj/machinery/door/firedoor/F in loc)
-		if(F != src)
-			spawn(1)
-				qdel(src)
-			return .
-
-	var/area/A = get_area(src)
-	ASSERT(istype(A))
-
-	A.all_doors.Add(src)
-	areas_added = list(A)
-
-	for(var/direction in cardinal)
-		A = get_area(get_step(src,direction))
-		if(istype(A) && !(A in areas_added))
-			A.all_doors.Add(src)
-			areas_added += A
-
-
-/obj/machinery/door/firedoor/Destroy()
-	for(var/area/A in areas_added)
-		A.all_doors.Remove(src)
-	. = ..()
+	var/assembly_type = /obj/structure/firelock_frame	
+	var/nextstate = null
+	var/welded = 0
+	var/boltslocked = 1
+	var/can_deconstruct = 1
 
 /obj/machinery/door/firedoor/Bumped(atom/AM)
-	if(p_open || operating)	return
-	if(!density)	return ..()
+	if(p_open || operating)	
+		return
+	if(!density)	
+		return ..()
 	return 0
 
-
 /obj/machinery/door/firedoor/power_change()
 	if(powered(power_channel))
 		stat &= ~NOPOWER
@@ -60,154 +40,74 @@
 		stat |= NOPOWER
 	return
 
-/obj/machinery/door/firedoor/attack_hand(mob/user as mob)
-	return attackby(null, user)
-
 /obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
 	add_fingerprint(user)
+
 	if(operating)
-		return//Already doing something.
+		return
 
 	if(istype(C, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/W = C
 		if(W.remove_fuel(0, user))
-			blocked = !blocked
-			user.visible_message("\red \The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\
-			"You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\
-			"You hear something being welded.")
+			welded = !welded
+			to_chat(user, "<span class='danger'>You [welded ? "welded" : "unwelded"] \the [src]</span>")
 			update_icon()
 			return
 
-	if(blocked)
-		to_chat(user, "\red \The [src] is welded solid!")
-		return
-
-	var/area/A = get_area_master(src)
-	ASSERT(istype(A)) // This worries me.
-	var/alarmed = A.air_doors_activated || A.fire
-
-	if( istype(C, /obj/item/weapon/crowbar) || ( istype(C,/obj/item/weapon/twohanded/fireaxe) && C:wielded == 1 ) )
-		if(operating)
+	if(welded)
+		if(istype(C, /obj/item/weapon/wrench))
+			if(boltslocked)
+				to_chat(user, "<span class='notice'>There are screws locking the bolts in place!</span>")
+				return
+			playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+			user.visible_message("<span class='notice'>[user] starts undoing [src]'s bolts...</span>", \
+								 "<span class='notice'>You start unfastening [src]'s floor bolts...</span>")
+			if(!do_after(user, 50, target = src))
+				return
+			playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+			user.visible_message("<span class='notice'>[user] unfastens [src]'s bolts.</span>", \
+								 "<span class='notice'>You undo [src]'s floor bolts.</span>")
+			deconstruct(TRUE)
+			return
+		else if(istype(C, /obj/item/weapon/screwdriver))
+			user.visible_message("<span class='notice'>[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts...</span>", \
+								 "<span class='notice'>You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts...</span>")
+			playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
+			boltslocked = !boltslocked
+			return
+		else
+			to_chat(user, "<span class='warning'>\The [src] is welded solid!</span>")
 			return
-		if(blocked)
-			user.visible_message("\red \The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\
-			"You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\
-			"You hear someone struggle and metal straining.")
 
-		if(stat & (BROKEN|NOPOWER) || !density || !alarmed)
-			user.visible_message("\red \The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\
-			"You force \the [src] [density ? "open" : "closed"] with \the [C]!",\
-			"You hear metal strain, and a door [density ? "open" : "close"].")
-
-		else if(allowed(user))
-			user.visible_message("\blue \The [user] lifts \the [src] with \a [C].",\
-			"\The [src] scans your ID, and obediently opens as you apply your [C].",\
-			"You hear metal move, and a door [density ? "open" : "close"].")
+	if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe))
+		if(istype(C, /obj/item/weapon/twohanded/fireaxe))
+			var/obj/item/weapon/twohanded/fireaxe/F = C 
+			if(!F.wielded)
+				return
 
 		if(density)
-			spawn(0)
-				open()
-		else
-			spawn(0)
-				close()
-		return
-
-	var/access_granted = 0
-	var/users_name
-	if(!istype(C, /obj)) //If someone hit it with their hand.  We need to see if they are allowed.
-		if(allowed(user))
-			access_granted = 1
-		if(ishuman(user))
-			users_name = FindNameFromID(user)
-		else
-			users_name = "Unknown"
-
-	if(ishuman(user) && !stat && (istype(C, /obj/item/weapon/card/id) || istype(C, /obj/item/device/pda)))
-		var/obj/item/weapon/card/id/ID = C
-
-		if( istype(C, /obj/item/device/pda) )
-			var/obj/item/device/pda/pda = C
-			ID = pda.id
-		if(!istype(ID))
-			ID = null
-
-		if(ID)
-			users_name = ID.registered_name
-
-		if(check_access(ID))
-			access_granted = 1
-
-	var/answer = alert(user, "Are you sure you want to [density ? "open" : "close"] \the [src]?","\The [src] confirmation","Yes","No")
-	if(answer == "No")
-		return
-
-	if(user.stat || user.stunned || user.weakened || user.paralysis || get_dist(src, user) > 1)
-		to_chat(user, "Sorry, you must remain able bodied and close to \the [src] in order to use it.")
-		return
-
-	if(alarmed && density && !access_granted)
-		to_chat(user, "<span class='warning'>Access denied.  Please wait for authorities to arrive, or for the alert to clear.</span>")
-		return
-
-	else
-		user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
-		"\The [src] [density ? "open" : "close"]s.",\
-		"You hear a beep, and a door opening.")
-		// Accountability!
-		if(!logged_users)
-			logged_users = list()
-		logged_users += users_name
-
-	var/needs_to_close = 0
-	if(density)
-		if(alarmed)
-			needs_to_close = 1
-		spawn()
 			open()
-	else
-		spawn()
+		else
 			close()
 
-	if(needs_to_close)
-		spawn(50)
-			if(alarmed)
-				nextstate = CLOSED
-
-/obj/machinery/door/firedoor/attack_ai(mob/user as mob)
-	if(operating || stat & NOPOWER)
-		return //Already doing something or depowered.
-
-	if(blocked)
-		to_chat(user, "\red \The [src] is welded solid!")
+/obj/machinery/door/firedoor/attack_hand(mob/user)		
+	add_fingerprint(user)
+	if(welded || operating || stat & NOPOWER)
 		return
-
-	var/area/A = get_area_master(src)
-	ASSERT(istype(A)) // This worries me.
-	var/alarmed = A.air_doors_activated || A.fire
-
-	var/access_granted = 0
-	if(isAI(user) || isrobot(user))
-		access_granted = 1
-
-	if(access_granted == 1)
-		user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
-		"\The [src] [density ? "open" : "close"]s.",\
-		"You hear a beep, and a door opening.")
-
-	var/needs_to_close = 0
 	if(density)
-		if(alarmed)
-			needs_to_close = 1
-		spawn()
-			open()
+		open()
 	else
-		spawn()
-			close()
+		close()
+		
+/obj/machinery/door/firedoor/attack_ai(mob/user)
+	attack_hand(user)
 
-	if(needs_to_close)
-		spawn(50)
-			if(alarmed)
-				nextstate = CLOSED
+/obj/machinery/door/firedoor/attack_alien(mob/user)
+	add_fingerprint(user)
+	if(welded)
+		to_chat(user, "<span class='warning'>[src] refuses to budge!</span>")
+		return
+	open()
 
 /obj/machinery/door/firedoor/do_animate(animation)
 	switch(animation)
@@ -215,32 +115,25 @@
 			flick("door_opening", src)
 		if("closing")
 			flick("door_closing", src)
-	return
 
 /obj/machinery/door/firedoor/update_icon()
 	overlays.Cut()
 	if(density)
 		icon_state = "door_closed"
-		if(blocked)
+		if(welded)
 			overlays += "welded"
 	else
 		icon_state = "door_open"
-		if(blocked)
+		if(welded)
 			overlays += "welded_open"
-	return
 
 /obj/machinery/door/firedoor/open()
-	..()
+	. = ..()
 	latetoggle()
-	return
 
 /obj/machinery/door/firedoor/close()
-	..()
-	if(locate(/mob/living) in get_turf(src))
-		open()
-		return
+	. = ..()
 	latetoggle()
-	return
 
 /obj/machinery/door/firedoor/proc/latetoggle()
 	if(operating || stat & NOPOWER || !nextstate)
@@ -252,23 +145,30 @@
 		if(CLOSED)
 			nextstate = null
 			close()
-	return
-
-
-/obj/machinery/door/firedoor/border_only
+			
+/obj/machinery/door/firedoor/proc/deconstruct(disassembled = TRUE)
+	if(can_deconstruct)
+		var/obj/structure/firelock_frame/F = new assembly_type(get_turf(src))
+		if(disassembled)
+			F.constructionStep = CONSTRUCTION_PANEL_OPEN
+		else
+			F.constructionStep = CONSTRUCTION_WIRES_EXPOSED
+		F.update_icon()
+	qdel(src)
+	
+/obj/machinery/door/firedoor/border_only	
 	icon = 'icons/obj/doors/edge_Doorfire.dmi'
 	flags = ON_BORDER
 
-/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target, height=0)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
 	if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
-		if(air_group) return 0
 		return !density
 	else
 		return 1
 
-/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target as turf)
+/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target)
 	if(istype(mover) && mover.checkpass(PASSGLASS))
 		return 1
 	if(get_dir(loc, target) == dir)
@@ -276,8 +176,222 @@
 	else
 		return 1
 
-/obj/machinery/door/firedoor/border_only/CanAtmosPass(var/turf/T)
+/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T)
 	if(get_dir(loc, T) == dir)
 		return !density
 	else
-		return 1
+		return 1
+
+/obj/machinery/door/firedoor/heavy
+	name = "heavy firelock"
+	icon = 'icons/obj/doors/Doorfire.dmi'
+	glass = 0
+	opacity = 1
+	assembly_type = /obj/structure/firelock_frame/heavy
+	
+/obj/machinery/door/firedoor/heavy/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			qdel(src)
+
+/obj/item/weapon/firelock_electronics
+	name = "firelock electronics"
+	icon = 'icons/obj/doors/door_assembly.dmi'
+	icon_state = "door_electronics"
+	desc = "A circuit board used in construction of firelocks."
+	w_class = 2
+	materials = list(MAT_METAL=50, MAT_GLASS=50)
+
+/obj/structure/firelock_frame
+	name = "firelock frame"
+	desc = "A partially completed firelock."
+	icon = 'icons/obj/doors/Doorfire.dmi'
+	icon_state = "frame1"
+	anchored = 0
+	density = 1
+	var/constructionStep = CONSTRUCTION_NOCIRCUIT
+	var/reinforced = 0
+	
+/obj/structure/firelock_frame/heavy
+	name = "heavy firelock frame"
+	reinforced = 1
+
+/obj/structure/firelock_frame/examine(mob/user)
+	..()
+	switch(constructionStep)
+		if(CONSTRUCTION_PANEL_OPEN)
+			to_chat(user, "There is a small metal plate covering the wires.")
+		if(CONSTRUCTION_WIRES_EXPOSED)
+			to_chat(user, "Wires are trailing from the maintenance panel.")
+		if(CONSTRUCTION_GUTTED)
+			to_chat(user, "The circuit board is visible.")
+		if(CONSTRUCTION_NOCIRCUIT)
+			to_chat(user, "There are no electronics in the frame.")
+	if(reinforced)
+		to_chat(user, "The frame is reinforced.")
+
+/obj/structure/firelock_frame/update_icon()
+	..()
+	icon_state = "frame[constructionStep]"
+
+/obj/structure/firelock_frame/attackby(obj/item/weapon/C, mob/user)
+	switch(constructionStep)
+		if(CONSTRUCTION_PANEL_OPEN)
+			if(istype(C, /obj/item/weapon/crowbar))
+				playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+				user.visible_message("<span class='notice'>[user] starts prying something out from [src]...</span>", \
+									 "<span class='notice'>You begin prying out the wire cover...</span>")
+				if(!do_after(user, 50, target = src))
+					return
+				if(constructionStep != CONSTRUCTION_PANEL_OPEN)
+					return
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				user.visible_message("<span class='notice'>[user] pries out a metal plate from [src], exposing the wires.</span>", \
+									 "<span class='notice'>You remove the cover plate from [src], exposing the wires.</span>")
+				constructionStep = CONSTRUCTION_WIRES_EXPOSED
+				update_icon()
+				return
+			if(istype(C, /obj/item/weapon/wrench))
+				if(locate(/obj/machinery/door/firedoor) in get_turf(src))
+					to_chat(user, "<span class='warning'>There's already a firelock there.</span>")
+					return
+				playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+				user.visible_message("<span class='notice'>[user] starts bolting down [src]...</span>", \
+									 "<span class='notice'>You begin bolting [src]...</span>")
+				if(!do_after(user, 30, target = src))
+					return
+				if(locate(/obj/machinery/door/firedoor) in get_turf(src))
+					return
+				user.visible_message("<span class='notice'>[user] finishes the firelock.</span>", \
+									 "<span class='notice'>You finish the firelock.</span>")
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				if(reinforced)
+					new /obj/machinery/door/firedoor/heavy(get_turf(src))
+				else
+					new /obj/machinery/door/firedoor(get_turf(src))
+				qdel(src)
+				return
+			if(istype(C, /obj/item/stack/sheet/plasteel))
+				var/obj/item/stack/sheet/plasteel/P = C
+				if(reinforced)
+					to_chat(user, "<span class='warning'>[src] is already reinforced.</span>")
+					return
+				if(P.get_amount() < 2)
+					to_chat(user, "<span class='warning'>You need more plasteel to reinforce [src].</span>")
+					return
+				user.visible_message("<span class='notice'>[user] begins reinforcing [src]...</span>", \
+									 "<span class='notice'>You begin reinforcing [src]...</span>")
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				if(do_after(user, 60, target = src))
+					if(constructionStep != CONSTRUCTION_PANEL_OPEN || reinforced || P.get_amount() < 2 || !P)
+						return
+					user.visible_message("<span class='notice'>[user] reinforces [src].</span>", \
+										 "<span class='notice'>You reinforce [src].</span>")
+					playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+					P.use(2)
+					reinforced = 1
+				return
+
+		if(CONSTRUCTION_WIRES_EXPOSED)
+			if(istype(C, /obj/item/weapon/wirecutters))
+				playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1)
+				user.visible_message("<span class='notice'>[user] starts cutting the wires from [src]...</span>", \
+									 "<span class='notice'>You begin removing [src]'s wires...</span>")
+				if(!do_after(user, 60, target = src))
+					return
+				if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
+					return
+				user.visible_message("<span class='notice'>[user] removes the wires from [src].</span>", \
+									 "<span class='notice'>You remove the wiring from [src], exposing the circuit board.</span>")
+				var/obj/item/stack/cable_coil/B = new(get_turf(src))
+				B.amount = 5
+				constructionStep = CONSTRUCTION_GUTTED
+				update_icon()
+				return
+			if(istype(C, /obj/item/weapon/weldingtool))
+				var/obj/item/weapon/weldingtool/W = C
+				if(W.remove_fuel(1, user))
+					playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+					user.visible_message("<span class='notice'>[user] starts welding a metal plate into [src]...</span>", \
+										 "<span class='notice'>You begin welding the cover plate back onto [src]...</span>")
+					if(!do_after(user, 80, target = src))
+						return
+					if(constructionStep != CONSTRUCTION_WIRES_EXPOSED)
+						return
+					playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+					user.visible_message("<span class='notice'>[user] welds the metal plate into [src].</span>", \
+										 "<span class='notice'>You weld [src]'s cover plate into place, hiding the wires.</span>")
+				constructionStep = CONSTRUCTION_PANEL_OPEN
+				update_icon()
+				return
+		if(CONSTRUCTION_GUTTED)
+			if(istype(C, /obj/item/weapon/crowbar))
+				user.visible_message("<span class='notice'>[user] begins removing the circuit board from [src]...</span>", \
+									 "<span class='notice'>You begin prying out the circuit board from [src]...</span>")
+				playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+				if(!do_after(user, 50, target = src))
+					return
+				if(constructionStep != CONSTRUCTION_GUTTED)
+					return
+				user.visible_message("<span class='notice'>[user] removes [src]'s circuit board.</span>", \
+									 "<span class='notice'>You remove the circuit board from [src].</span>")
+				new /obj/item/weapon/firelock_electronics(get_turf(src))
+				playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+				constructionStep = CONSTRUCTION_NOCIRCUIT
+				update_icon()
+				return
+			if(istype(C, /obj/item/stack/cable_coil))
+				var/obj/item/stack/cable_coil/B = C
+				if(B.get_amount() < 5)
+					to_chat(user, "<span class='warning'>You need more wires to add wiring to [src].</span>")
+					return
+				user.visible_message("<span class='notice'>[user] begins wiring [src]...</span>", \
+									 "<span class='notice'>You begin adding wires to [src]...</span>")
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				if(do_after(user, 60, target = src))
+					if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B)
+						return
+					user.visible_message("<span class='notice'>[user] adds wires to [src].</span>", \
+										 "<span class='notice'>You wire [src].</span>")
+					playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+					B.use(5)
+					constructionStep = CONSTRUCTION_WIRES_EXPOSED
+					update_icon()
+				return
+		if(CONSTRUCTION_NOCIRCUIT)
+			if(istype(C, /obj/item/weapon/weldingtool))
+				var/obj/item/weapon/weldingtool/W = C
+				if(W.remove_fuel(1,user))
+					playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+					user.visible_message("<span class='notice'>[user] begins cutting apart [src]'s frame...</span>", \
+										 "<span class='notice'>You begin slicing [src] apart...</span>")
+					if(!do_after(user, 80, target = src))
+						return
+					if(constructionStep != CONSTRUCTION_NOCIRCUIT)
+						return
+					user.visible_message("<span class='notice'>[user] cuts apart [src]!</span>", \
+										 "<span class='notice'>You cut [src] into metal.</span>")
+					playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
+					var/turf/T = get_turf(src)
+					new /obj/item/stack/sheet/metal(T, 3)
+					if(reinforced)
+						new /obj/item/stack/sheet/plasteel(T, 2)
+					qdel(src)
+				return
+			if(istype(C, /obj/item/weapon/firelock_electronics))
+				user.visible_message("<span class='notice'>[user] starts adding [C] to [src]...</span>", \
+									 "<span class='notice'>You begin adding a circuit board to [src]...</span>")
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				if(!do_after(user, 40, target = src))
+					return
+				if(constructionStep != CONSTRUCTION_NOCIRCUIT)
+					return
+				user.drop_item()
+				qdel(C)
+				user.visible_message("<span class='notice'>[user] adds a circuit to [src].</span>", \
+									 "<span class='notice'>You insert and secure [C].</span>")
+				playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+				constructionStep = CONSTRUCTION_GUTTED
+				update_icon()
+				return
+	return ..()

code/game/machinery/hologram.dm

@@ -28,6 +28,7 @@ Possible to do for anyone motivated enough:
 // 0 = RANGE BASED
 // 1 = AREA BASED
 var/const/HOLOPAD_MODE = 0
+var/list/holopads = list()
 
 /obj/machinery/hologram/holopad
 	name = "\improper AI holopad"
@@ -42,6 +43,7 @@ var/const/HOLOPAD_MODE = 0
 
 /obj/machinery/hologram/holopad/New()
 	..()
+	holopads += src
 	component_parts = list()
 	component_parts += new /obj/item/weapon/circuitboard/holopad(null)
 	component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
@@ -89,13 +91,15 @@ var/const/HOLOPAD_MODE = 0
 	if(user.eyeobj.loc != src.loc)//Set client eye on the object if it's not already.
 		user.eyeobj.setLoc(get_turf(src))
 	else if(!hologram)//If there is no hologram, possibly make one.
-		activate_holo(user)
+		activate_holo(user, 0)
 	else if(master == user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
 		clear_holo()
 	return
 
-/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user)
-	if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
+/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user, var/force = 0)
+	if(!force && user.eyeobj.loc != src.loc) // allows holopads to pass off holograms to the next holopad in the chain
+		to_chat(user, "<font color='red'>ERROR:</font> Unable to project hologram.")
+	else if(!(stat & NOPOWER))//If the projector has power
 		if(user.holo)
 			var/obj/machinery/hologram/holopad/current = user.holo
 			current.clear_holo()
@@ -163,7 +167,17 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 					if(eye_area != holo_area)
 						return 1
 
+		var/mob/living/silicon/ai/theai = master
+		var/turf/target_turf = get_turf(master.eyeobj)
+		var/newdir = hologram.dir
 		clear_holo()//If not, we want to get rid of the hologram.
+		var/obj/machinery/hologram/holopad/pad_close = get_closest_atom(/obj/machinery/hologram/holopad, holopads, theai.eyeobj)
+		if(get_dist(pad_close, theai.eyeobj) <= pad_close.holo_range)
+			if(!(pad_close.stat & NOPOWER) && !pad_close.hologram)
+				pad_close.activate_holo(theai, 1)
+				if(pad_close.hologram)
+					pad_close.hologram.forceMove(target_turf)
+					pad_close.hologram.dir = newdir
 	return 1
 
 /obj/machinery/hologram/holopad/proc/move_hologram()
@@ -221,6 +235,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	return
 
 /obj/machinery/hologram/holopad/Destroy()
+	holopads -= src
 	if(hologram)
 		clear_holo()
 	return ..()

code/game/machinery/quantum_pad.dm

@@ -0,0 +1,148 @@
+/obj/machinery/quantumpad
+	name = "quantum pad"
+	desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads."
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "qpad-idle"
+	anchored = 1
+	use_power = 1
+	idle_power_usage = 200
+	active_power_usage = 5000
+	var/teleport_cooldown = 400 //30 seconds base due to base parts
+	var/teleport_speed = 50
+	var/last_teleport //to handle the cooldown
+	var/teleporting = 0 //if it's in the process of teleporting
+	var/power_efficiency = 1
+	var/obj/machinery/quantumpad/linked_pad = null
+
+/obj/machinery/quantumpad/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/quantumpad(null)
+	component_parts += new /obj/item/weapon/ore/bluespace_crystal/artificial(null)
+	component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+	component_parts += new /obj/item/stack/cable_coil(null, 1)
+	RefreshParts()
+
+/obj/machinery/quantumpad/Destroy()
+	linked_pad = null
+	return ..()
+
+/obj/machinery/quantumpad/RefreshParts()
+	var/E = 0
+	for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
+		E += C.rating
+	power_efficiency = E
+	E = 0
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		E += M.rating
+	teleport_speed = initial(teleport_speed)
+	teleport_speed -= (E*10)
+	teleport_cooldown = initial(teleport_cooldown)
+	teleport_cooldown -= (E * 100)
+
+/obj/machinery/quantumpad/attackby(obj/item/I, mob/user, params)
+	if(default_deconstruction_screwdriver(user, "pad-idle-o", "qpad-idle", I))
+		return
+
+	if(panel_open)
+		if(ismultitool(I))
+			var/obj/item/device/multitool/M = I
+			M.buffer = src
+			to_chat(user, "<span class='notice'>You save the data in the [I.name]'s buffer.</span>")
+			return 1
+	else if(ismultitool(I))
+		var/obj/item/device/multitool/M = I
+		if(istype(M.buffer, /obj/machinery/quantumpad))
+			linked_pad = M.buffer
+			to_chat(user, "<span class='notice'>You link the [src] to the one in the [I.name]'s buffer.</span>")
+			return 1
+
+	if(exchange_parts(user, I))
+		return
+
+	if(default_deconstruction_crowbar(I))
+		return
+
+	return ..()
+
+/obj/machinery/quantumpad/attack_hand(mob/user)
+	if(panel_open)
+		to_chat(user, "<span class='warning'>The panel must be closed before operating this machine!</span>")
+		return
+
+	if(!linked_pad || qdeleted(linked_pad))
+		to_chat(user, "<span class='warning'>There is no linked pad!</span>")
+		return
+
+	if(world.time < last_teleport + teleport_cooldown)
+		to_chat(user, "<span class='warning'>[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time) / 10)] seconds.</span>")
+		return
+
+	if(teleporting)
+		to_chat(user, "<span class='warning'>[src] is charging up. Please wait.</span>")
+		return
+
+	if(linked_pad.teleporting)
+		to_chat(user, "<span class='warning'>Linked pad is busy. Please wait.</span>")
+		return
+
+	if(linked_pad.stat & NOPOWER)
+		to_chat(user, "<span class='warning'>Linked pad is not responding to ping.</span>")
+		return
+	add_fingerprint(user)
+	doteleport(user)
+
+/obj/machinery/quantumpad/proc/sparks()
+	var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+	s.set_up(5, 1, get_turf(src))
+	s.start()
+
+/obj/machinery/quantumpad/attack_ghost(mob/dead/observer/ghost)
+	if(linked_pad)
+		ghost.forceMove(get_turf(linked_pad))
+
+/obj/machinery/quantumpad/proc/doteleport(mob/user)
+	if(linked_pad)
+		playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
+		teleporting = 1
+
+		spawn(teleport_speed)
+			if(!src || qdeleted(src))
+				teleporting = 0
+				return
+			if(stat & NOPOWER)
+				to_chat(user, "<span class='warning'>[src] is unpowered!</span>")
+				teleporting = 0
+				return
+			if(!linked_pad || qdeleted(linked_pad) || linked_pad.stat & NOPOWER)
+				to_chat(user, "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>")
+				teleporting = 0
+				return
+
+			teleporting = 0
+			last_teleport = world.time
+
+			// use a lot of power
+			use_power(10000 / power_efficiency)
+			sparks()
+			linked_pad.sparks()
+
+			flick("qpad-beam", src)
+			playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
+			flick("qpad-beam", linked_pad)
+			playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
+			for(var/atom/movable/ROI in get_turf(src))
+				// if is anchored, don't let through
+				if(ROI.anchored)
+					if(isliving(ROI))
+						var/mob/living/L = ROI
+						if(L.buckled)
+							// TP people on office chairs
+							if(L.buckled.anchored)
+								continue
+						else
+							continue
+					else if(!isobserver(ROI))
+						continue
+				do_teleport(ROI, get_turf(linked_pad))

code/game/machinery/vending.dm

@@ -1128,7 +1128,7 @@
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
+	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/firelock_electronics = 10,/obj/item/weapon/firealarm_electronics = 10,/obj/item/weapon/apc_electronics = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10,/obj/item/weapon/camera_assembly = 10)
 	contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)
 

code/game/objects/effects/aliens.dm

@@ -363,7 +363,8 @@
 							break
 
 /obj/structure/alien/egg/bullet_act(obj/item/projectile/Proj)
-	health -= Proj.damage
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
 	..()
 	healthcheck()
 

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -117,9 +117,9 @@ var/global/list/image/splatter_cache=list()
 		user.hand_blood_color = basecolor
 		user.update_inv_gloves(1)
 		user.verbs += /mob/living/carbon/human/proc/bloody_doodle
-		
+
 /obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
-	return amount
+	return TRUE
 
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")

code/game/objects/effects/overlays.dm

@@ -113,6 +113,18 @@
 	layer = 4.1
 	duration = 4
 	
+/obj/effect/overlay/temp/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8
+
+/obj/effect/overlay/temp/explosion/fast
+	icon_state = "explosionfast"
+	duration = 4
+	
 /obj/effect/overlay/temp/decoy
 	desc = "It's a decoy!"
 	duration = 15

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

@@ -194,6 +194,6 @@
 				/obj/item/weapon/stock_parts/scanning_module = 1,
 				/obj/item/weapon/spacecash/c200 = 1,
 				/obj/item/weapon/airlock_electronics = 1,
-				/obj/item/weapon/gun/energy/kinetic_accelerator/super = 1,
+				/obj/item/weapon/gun/energy/kinetic_accelerator = 1,
 				/obj/item/pizzabox = 3,
 				)

code/game/objects/items/devices/flashlight.dm

@@ -54,8 +54,8 @@
 			return
 
 		var/mob/living/carbon/human/H = M	//mob has protective eyewear
-		if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
-			to_chat(user, "<span class='notice'>You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.</span>")
+		if(istype(H) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+			to_chat(user, "<span class='notice'>You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask" : "glasses"] first.</span>")
 			return
 
 		if(M == user)	//they're using it on themselves
@@ -70,12 +70,13 @@
 			user.visible_message("<span class='notice'>[user] directs [src] to [M]'s eyes.</span>", \
 								 "<span class='notice'>You direct [src] to [M]'s eyes.</span>")
 
-			if(istype(M, /mob/living/carbon/human))	//robots and aliens are unaffected
-				if(M.stat == DEAD || M.disabilities & BLIND)	//mob is dead or fully blind
-					to_chat(user, "<span class='notice'>[M] pupils does not react to the light!</span>")
-				else if(XRAY in M.mutations)	//mob has X-RAY vision
-					to_chat(user, "<span class='notice'>[M] pupils give an eerie glow!</span>")
-				else	//they're okay!
+			if(istype(H)) //robots and aliens are unaffected
+				var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
+				if(M.stat == DEAD || !eyes || M.disabilities & BLIND)	//mob is dead or fully blind
+					to_chat(user, "<span class='notice'>[M]'s pupils are unresponsive to the light!</span>")
+				else if((XRAY in M.mutations) || (eyes.colourblind_darkview && eyes.colourblind_darkview == eyes.get_dark_view())) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
+					to_chat(user, "<span class='notice'>[M]'s pupils glow eerily!</span>")
+				else //they're okay!
 					if(M.flash_eyes(visual = 1))
 						to_chat(user, "<span class='notice'>[M]'s pupils narrow.</span>")
 	else

code/game/objects/items/devices/transfer_valve.dm

@@ -2,11 +2,12 @@
 	icon = 'icons/obj/assemblies.dmi'
 	name = "tank transfer valve"
 	icon_state = "valve_1"
+	item_state = "ttv"
 	desc = "Regulates the transfer of air between two tanks"
-	var/obj/item/weapon/tank/tank_one
-	var/obj/item/weapon/tank/tank_two
-	var/obj/item/device/attached_device
-	var/mob/attacher = null
+	var/obj/item/weapon/tank/tank_one = null
+	var/obj/item/weapon/tank/tank_two = null
+	var/obj/item/device/assembly/attached_device = null
+	var/mob/living/attacher = null
 	var/valve_open = 0
 	var/toggle = 1
 	origin_tech = "materials=1;engineering=1"
@@ -21,75 +22,79 @@
 	if(attached_device)
 		qdel(attached_device)
 		attached_device = null
+	attacher = null
 	return ..()
 
-/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
-
 /obj/item/device/transfer_valve/IsAssemblyHolder()
 	return 1
 
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
-	if(istype(item, /obj/item/weapon/tank))
+/obj/item/device/transfer_valve/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/tank))
 		if(tank_one && tank_two)
 			to_chat(user, "<span class='warning'>There are already two tanks attached, remove one first.</span>")
 			return
 
 		if(!tank_one)
-			tank_one = item
-			user.drop_item()
-			item.loc = src
+			if(!user.unEquip(I))
+				return
+			tank_one = I
+			I.forceMove(src)
 			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(I.w_class > w_class)
+				w_class = I.w_class
 		else if(!tank_two)
-			tank_two = item
-			user.drop_item()
-			item.loc = src
+			if(!user.unEquip(I))
+				return
+			tank_two = I
+			I.forceMove(src)
 			to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
+			if(I.w_class > w_class)
+				w_class = I.w_class
 
 		update_icon()
 		nanomanager.update_uis(src) // update all UIs attached to src
 //TODO: Have this take an assemblyholder
-	else if(isassembly(item))
-		var/obj/item/device/assembly/A = item
+	else if(isassembly(I))
+		var/obj/item/device/assembly/A = I
 		if(A.secured)
 			to_chat(user, "<span class='notice'>The device is secured.</span>")
 			return
 		if(attached_device)
 			to_chat(user, "<span class='warning'>There is already a device attached to the valve, remove it first.</span>")
 			return
-		user.remove_from_mob(item)
+		user.remove_from_mob(A)
 		attached_device = A
-		A.loc = src
-		to_chat(user, "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>")
+		A.forceMove(src)
+		to_chat(user, "<span class='notice'>You attach the [A] to the valve controls and secure it.</span>")
 		A.holder = src
 		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
 
-		bombers += "[key_name(user)] attached a [item] to a transfer valve."
-		msg_admin_attack("[key_name_admin(user)]attached [item] to a transfer valve.")
-		log_game("[key_name_admin(user)] attached [item] to a transfer valve.")
+		bombers += "[key_name(user)] attached a [A] to a transfer valve."
+		msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.")
+		log_game("[key_name_admin(user)] attached [A] to a transfer valve.")
 		attacher = user
 		nanomanager.update_uis(src) // update all UIs attached to src
-	return
 
 
-/obj/item/device/transfer_valve/HasProximity(atom/movable/AM as mob|obj)
-	if(!attached_device)	return
+/obj/item/device/transfer_valve/HasProximity(atom/movable/AM)
+	if(!attached_device)
+		return
 	attached_device.HasProximity(AM)
-	return
 
-/obj/item/device/transfer_valve/hear_talk(mob/living/M as mob, msg)
+/obj/item/device/transfer_valve/hear_talk(mob/living/M, msg)
 	..()
 	for(var/obj/O in contents)
 		O.hear_talk(M, msg)
 
-/obj/item/device/transfer_valve/hear_message(mob/living/M as mob, msg)
+/obj/item/device/transfer_valve/hear_message(mob/living/M, msg)
 	..()
 	for(var/obj/O in contents)
 		O.hear_message(M, msg)
 
-/obj/item/device/transfer_valve/attack_self(mob/user as mob)
+/obj/item/device/transfer_valve/attack_self(mob/user)
 	ui_interact(user)
 
-/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
@@ -113,36 +118,40 @@
 
 /obj/item/device/transfer_valve/Topic(href, href_list)
 	..()
-	if( usr.stat || usr.restrained() )
+	if(usr.incapacitated())
 		return 0
-	if(src.loc != usr)
+	if(loc != usr)
 		return 0
 	if(tank_one && href_list["tankone"])
 		split_gases()
 		valve_open = 0
-		tank_one.loc = get_turf(src)
+		tank_one.forceMove(get_turf(src))
 		tank_one = null
 		update_icon()
+		if((!tank_two || tank_two.w_class < 4) && (w_class > 3))
+			w_class = 3
 	else if(tank_two && href_list["tanktwo"])
 		split_gases()
 		valve_open = 0
-		tank_two.loc = get_turf(src)
+		tank_two.forceMove(get_turf(src))
 		tank_two = null
 		update_icon()
+		if((!tank_one || tank_one.w_class < 4) && (w_class > 3))
+			w_class = 3
 	else if(href_list["open"])
 		toggle_valve()
 	else if(attached_device)
 		if(href_list["rem_device"])
-			attached_device.loc = get_turf(src)
-			attached_device:holder = null
+			attached_device.forceMove(get_turf(src))
+			attached_device.holder = null
 			attached_device = null
 			update_icon()
 		if(href_list["device"])
 			attached_device.attack_self(usr)
-	src.add_fingerprint(usr)
+	add_fingerprint(usr)
 	return 1 // Returning 1 sends an update to attached UIs
 
-/obj/item/device/transfer_valve/process_activation(var/obj/item/device/D)
+/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D)
 	if(toggle)
 		toggle = 0
 		toggle_valve()
@@ -188,7 +197,7 @@
 	*/
 
 /obj/item/device/transfer_valve/proc/toggle_valve()
-	if(valve_open==0 && (tank_one && tank_two))
+	if(!valve_open && tank_one && tank_two)
 		valve_open = 1
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
@@ -206,17 +215,12 @@
 		log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
 		merge_gases()
 		spawn(20) // In case one tank bursts
-			for(var/i=0,i<5,i++)
-				src.update_icon()
+			for(var/i in 1 to 5)
+				update_icon()
 				sleep(10)
-			src.update_icon()
+			update_icon()
 
-	else if(valve_open==1 && (tank_one && tank_two))
+	else if(valve_open && tank_one && tank_two)
 		split_gases()
 		valve_open = 0
-		src.update_icon()
-
-// this doesn't do anything but the timer etc. expects it to be here
-// eventually maybe have it update icon to show state (timer, prox etc.) like old bombs
-/obj/item/device/transfer_valve/proc/c_state()
-	return
+		update_icon()

code/game/objects/items/robot/robot_upgrades.dm

@@ -196,25 +196,6 @@
 
 	return 1
 
-/obj/item/borg/upgrade/hyperka
-	name = "mining cyborg hyper-kinetic accelerator"
-	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/miner
-
-/obj/item/borg/upgrade/hyperka/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	for(var/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
-		qdel(H)
-
-	R.module.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/hyper/cyborg(R.module)
-	R.module.rebuild()
-
-	return 1
-
 /obj/item/borg/upgrade/syndicate
 	name = "illegal equipment module"
 	desc = "Unlocks the hidden, deadlier functions of a cyborg"

code/game/objects/items/stacks/sheets/light.dm

@@ -3,6 +3,7 @@
 	gender = PLURAL
 	singular_name = "wired glass floor tile"
 	desc = "A glass tile, which is wired, somehow."
+	icon = 'icons/obj/tiles.dmi'
 	icon_state = "glass_wire"
 	w_class = 3
 	force = 3.0

code/game/objects/items/stacks/sheets/mineral.dm

@@ -12,9 +12,6 @@ Mineral Sheets
 		- Tranqillite
 		- Enriched Uranium
 		- Platinum
-		- Metallic Hydrogen
-		- Tritium
-		- Osmium
 */
 
 var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
@@ -24,23 +21,34 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 
 var/global/list/datum/stack_recipe/silver_recipes = list ( \
 	new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
 	)
 
 var/global/list/datum/stack_recipe/diamond_recipes = list ( \
 	new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20),  \
 	)
 
 var/global/list/datum/stack_recipe/uranium_recipes = list ( \
 	new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
 	)
 
 var/global/list/datum/stack_recipe/gold_recipes = list ( \
 	new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
+	null, \
 	new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
 	)
 
 var/global/list/datum/stack_recipe/plasma_recipes = list ( \
 	new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
 	)
 
 var/global/list/datum/stack_recipe/plastic_recipes = list ( \
@@ -61,13 +69,24 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	)
 
 var/global/list/datum/stack_recipe/bananium_recipes = list ( \
+	new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \
+	null, \
 	new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \
 	)
 
 var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
-	new/datum/stack_recipe("silent tile", /obj/item/stack/tile/silent, 1, 4, 20), \
 	new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
+	null, \
+	new/datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), \
+	)
+
+var/global/list/datum/stack_recipe/abductor_recipes = list ( \
+	new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
 	)
 
 /obj/item/stack/sheet/mineral
@@ -100,11 +119,11 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/diamond
 	name = "diamond"
 	icon_state = "sheet-diamond"
+	singular_name = "diamond"
 	origin_tech = "materials=6"
 	sheettype = "diamond"
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
 
-
 /obj/item/stack/sheet/mineral/diamond/New()
 	..()
 	recipes = diamond_recipes
@@ -112,6 +131,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/uranium
 	name = "uranium"
 	icon_state = "sheet-uranium"
+	singular_name = "uranium sheet"
 	origin_tech = "materials=5"
 	sheettype = "uranium"
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -123,6 +143,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/plasma
 	name = "solid plasma"
 	icon_state = "sheet-plasma"
+	singular_name = "plasma sheet"
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
@@ -161,6 +182,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/gold
 	name = "gold"
 	icon_state = "sheet-gold"
+	singular_name = "gold bar"
 	origin_tech = "materials=4"
 	sheettype = "gold"
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
@@ -172,6 +194,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/silver
 	name = "silver"
 	icon_state = "sheet-silver"
+	singular_name = "silver bar"
 	origin_tech = "materials=3"
 	sheettype = "silver"
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
@@ -183,23 +206,24 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 /obj/item/stack/sheet/mineral/bananium
 	name = "bananium"
 	icon_state = "sheet-clown"
+	singular_name = "bananium sheet"
 	origin_tech = "materials=4"
 	sheettype = "bananium"
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 
-/obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/bananium/New(loc, amount=null)
 	..()
 	recipes = bananium_recipes
 
 /obj/item/stack/sheet/mineral/tranquillite
 	name = "tranquillite"
-	singular_name = "beret"
 	icon_state = "sheet-mime"
+	singular_name = "beret"
 	origin_tech = "materials=4"
 	sheettype = "tranquillite"
 	materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
 
-/obj/item/stack/sheet/mineral/tranquillite/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
 	..()
 	recipes = tranquillite_recipes
 
@@ -209,9 +233,7 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 	origin_tech = "materials=6"
 	materials = list(MAT_URANIUM=3000)
 
-/*
- * Alien Alloy
- */
+//Alien Alloy
 /obj/item/stack/sheet/mineral/abductor
 	name = "alien alloy"
 	icon = 'icons/obj/abductor.dmi'
@@ -225,14 +247,6 @@ var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
 	origin_tech = "materials=6;abductor=1"
 	sheettype = "abductor"
 
-var/global/list/datum/stack_recipe/abductor_recipes = list ( \
-	new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
-	null, \
-	new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
-	)
-
-/obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/abductor/New(loc, amount=null)
 	recipes = abductor_recipes
 	..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -53,6 +53,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
 	null,
 	new /datum/stack_recipe_list("airlock assemblies", list(
@@ -63,7 +64,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 		new /datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1),
 		new /datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1),
 		new /datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1),
-/*		new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), */
 		new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1),
 		new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1),
 		new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1),

code/game/objects/items/stacks/tiles/tile_mineral.dm

@@ -1,3 +1,68 @@
+/obj/item/stack/tile/mineral/plasma
+	name = "plasma tile"
+	singular_name = "plasma floor tile"
+	desc = "A tile made out of highly flammable plasma. This can only end well."
+	icon_state = "tile_plasma"
+	origin_tech = "plasmatech=1"
+	turf_type = /turf/simulated/floor/mineral/plasma
+	mineralType = "plasma"
+	materials = list(MAT_PLASMA=500)
+
+/obj/item/stack/tile/mineral/uranium
+	name = "uranium tile"
+	singular_name = "uranium floor tile"
+	desc = "A tile made out of uranium. You feel a bit woozy."
+	icon_state = "tile_uranium"
+	turf_type = /turf/simulated/floor/mineral/uranium
+	mineralType = "uranium"
+	materials = list(MAT_URANIUM=500)
+
+/obj/item/stack/tile/mineral/gold
+	name = "gold tile"
+	singular_name = "gold floor tile"
+	desc = "A tile made out of gold, the swag seems strong here."
+	icon_state = "tile_gold"
+	turf_type = /turf/simulated/floor/mineral/gold
+	mineralType = "gold"
+	materials = list(MAT_GOLD=500)
+
+/obj/item/stack/tile/mineral/silver
+	name = "silver tile"
+	singular_name = "silver floor tile"
+	desc = "A tile made out of silver, the light shining from it is blinding."
+	icon_state = "tile_silver"
+	turf_type = /turf/simulated/floor/mineral/silver
+	mineralType = "silver"
+	materials = list(MAT_SILVER=500)
+
+/obj/item/stack/tile/mineral/diamond
+	name = "diamond tile"
+	singular_name = "diamond floor tile"
+	desc = "A tile made out of diamond. Wow, just, wow."
+	icon_state = "tile_diamond"
+	origin_tech = "materials=2"
+	turf_type = /turf/simulated/floor/mineral/diamond
+	mineralType = "diamond"
+	materials = list(MAT_DIAMOND=500)
+
+/obj/item/stack/tile/mineral/bananium
+	name = "bananium tile"
+	singular_name = "bananium floor tile"
+	desc = "A tile made out of bananium, HOOOOOOOOONK!"
+	icon_state = "tile_bananium"
+	turf_type = /turf/simulated/floor/mineral/bananium
+	mineralType = "bananium"
+	materials = list(MAT_BANANIUM=500)
+
+/obj/item/stack/tile/mineral/tranquillite
+	name = "silent tile"
+	singular_name = "silent floor tile"
+	desc = "A tile made out of tranquillite, SHHHHHHHHH!"
+	icon_state = "tile_tranquillite"
+	turf_type = /turf/simulated/floor/mineral/tranquillite
+	mineralType = "tranquillite"
+	materials = list(MAT_TRANQUILLITE=500)
+
 /obj/item/stack/tile/mineral/abductor
 	name = "alien floor tile"
 	singular_name = "alien floor tile"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -1,19 +1,8 @@
-/* Different misc types of tiles
- * Contains:
- *		Grass
- *		Wood
- *		Carpet
- *		Plasteel
- *		Light
- *		Fakespace
- *		High-traction
- \\ If you don't update the contains list, I'm going to shank you
- */
 /obj/item/stack/tile
 	name = "broken tile"
 	singular_name = "broken tile"
 	desc = "A broken tile. This should not exist."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tiles.dmi'
 	icon_state = "tile"
 	item_state = "tile"
 	w_class = 3
@@ -23,12 +12,64 @@
 	throw_range = 20
 	max_amount = 60
 	flags = CONDUCT
+	origin_tech = "materials=1"
 	var/turf_type = null
 	var/mineralType = null
 
-/*
- * Grass
- */
+/obj/item/stack/tile/New(loc, amount)
+	..()
+	pixel_x = rand(-3, 3)
+	pixel_y = rand(-3, 3) //randomize a little
+
+/obj/item/stack/tile/attackby(obj/item/W, mob/user, params)
+	if(iswelder(W))
+		var/obj/item/weapon/weldingtool/WT = W
+
+		if(is_hot(W) && !mineralType)
+			to_chat(user, "<span class='warning'>You can not reform this!</span>")
+			return
+
+		if(get_amount() < 4)
+			to_chat(user, "<span class='warning'>You need at least four tiles to do this!</span>")
+			return
+
+		if(WT.remove_fuel(0,user))
+
+			if(mineralType == "plasma")
+				atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5)
+				user.visible_message("<span class='warning'>[user.name] sets the plasma tiles on fire!</span>", \
+									"<span class='warning'>You set the plasma tiles on fire!</span>")
+				qdel(src)
+				return
+
+			if (mineralType == "metal")
+				var/obj/item/stack/sheet/metal/new_item = new(user.loc)
+				user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \
+							 "<span class='notice'>You shaped [src] into metal with the welding tool.</span>", \
+							 "<span class='italics'>You hear welding.</span>")
+				var/obj/item/stack/rods/R = src
+				src = null
+				var/replace = (user.get_inactive_hand()==R)
+				R.use(4)
+				if(!R && replace)
+					user.put_in_hands(new_item)
+
+			else
+				var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+				var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
+				user.visible_message("[user.name] shaped [src] into a sheet with the welding tool.", \
+							 "<span class='notice'>You shaped [src] into a sheet with the welding tool.</span>", \
+							 "<span class='italics'>You hear welding.</span>")
+				var/obj/item/stack/rods/R = src
+				src = null
+				var/replace = (user.get_inactive_hand()==R)
+				R.use(4)
+				if (!R && replace)
+					user.put_in_hands(new_item)
+	else
+		return ..()
+
+//Grass
 /obj/item/stack/tile/grass
 	name = "grass tiles"
 	gender = PLURAL
@@ -39,21 +80,18 @@
 	turf_type = /turf/simulated/floor/grass
 	burn_state = FLAMMABLE
 
-/*
- * Wood
- */
+//Wood
 /obj/item/stack/tile/wood
 	name = "wood floor tiles"
 	gender = PLURAL
 	singular_name = "wood floor tile"
 	desc = "an easy to fit wood floor tile"
 	icon_state = "tile-wood"
+	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/wood
 	burn_state = FLAMMABLE
 
-/*
- * Carpets
- */
+//Carpets
 /obj/item/stack/tile/carpet
 	name = "carpet"
 	singular_name = "carpet"
@@ -62,9 +100,7 @@
 	turf_type = /turf/simulated/floor/carpet
 	burn_state = FLAMMABLE
 
-/*
- * Plasteel
- */
+//Plasteel
 /obj/item/stack/tile/plasteel
 	name = "floor tiles"
 	gender = PLURAL
@@ -80,9 +116,7 @@
 	turf_type = /turf/simulated/floor/plasteel
 	mineralType = "metal"
 
-/*
- * Light
- */
+//Light
 /obj/item/stack/tile/light
 	name = "light tiles"
 	gender = PLURAL
@@ -94,9 +128,7 @@
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 	turf_type = /turf/simulated/floor/light
 
-/*
- * Fakespace
- */
+//Fakespace
 /obj/item/stack/tile/fakespace
 	name = "astral carpet"
 	singular_name = "astral carpet"
@@ -120,16 +152,6 @@
 /obj/item/stack/tile/noslip/loaded
 	amount = 20
 
-/obj/item/stack/tile/silent
-	name = "silent tile"
-	singular_name = "silent floor tile"
-	desc = "A tile made out of tranquillite, SHHHHHHHHH!"
-	icon_state = "tile-silent"
-	origin_tech = "materials=1"
-	turf_type = /turf/simulated/floor/silent
-	mineralType = "tranquillite"
-	materials = list(MAT_TRANQUILLITE=500)
-
 //Pod floor
 /obj/item/stack/tile/pod
 	name = "pod floor tile"

code/game/objects/items/toys.dm

@@ -43,14 +43,20 @@
 /obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	return
 
-/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
-	if(!proximity) return
-	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1)
-		A.reagents.trans_to(src, 10)
-		to_chat(user, "<span class='notice'>You fill the balloon with the contents of [A].</span>")
-		desc = "A translucent balloon with some form of liquid sloshing around in it."
-		update_icon()
-	return
+/obj/item/toy/balloon/afterattack(atom/A, mob/user, proximity)
+	if(!proximity)
+		return
+	if(istype(A, /obj/structure/reagent_dispensers))
+		var/obj/structure/reagent_dispensers/RD = A
+		if(RD.reagents.total_volume <= 0)
+			to_chat(user, "<span class='warning'>[RD] is empty.</span>")
+		else if(reagents.total_volume >= 10)
+			to_chat(user, "<span class='warning'>[src] is full.</span>")
+		else
+			A.reagents.trans_to(src, 10)
+			to_chat(user, "<span class='notice'>You fill the balloon with the contents of [A].</span>")
+			desc = "A translucent balloon with some form of liquid sloshing around in it."
+			update_icon()
 
 /obj/item/toy/balloon/wash(mob/user, atom/source)
 	if(reagents.total_volume < 10)
@@ -877,7 +883,7 @@ obj/item/toy/cards/deck/syndicate/black
 
 /obj/item/toy/minimeteor
 	name = "Mini-Meteor"
-	desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™"
+	desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "minimeteor"
 	w_class = 2

code/game/objects/items/weapons/implants/implant_storage.dm

@@ -49,6 +49,10 @@
 
 	return ..()
 
+/obj/item/weapon/implant/storage/proc/get_contents() //Used for swiftly returning a list of the implant's contents i.e. for checking a theft objective's completion.
+	if(storage && storage.contents)
+		return storage.contents
+
 /obj/item/weapon/implanter/storage
 	name = "implanter (storage)"
 

code/game/objects/items/weapons/power_cells.dm

@@ -30,6 +30,14 @@
 	processing_objects.Remove(src)
 	return ..()
 
+/obj/item/weapon/stock_parts/cell/on_varedit(modified_var)
+	if(modified_var == "self_recharge")
+		if(self_recharge)
+			processing_objects.Add(src)
+		else
+			processing_objects.Remove(src)
+	..()
+
 /obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
 	to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</span>")
 	return (FIRELOSS)

code/game/objects/items/weapons/powerfist.dm

@@ -87,7 +87,7 @@
 	target.apply_damage(force * fisto_setting, BRUTE)
 	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as they punch [target.name]!</span>", \
 		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-	new/obj/effect/kinetic_blast(target.loc)
+	new /obj/effect/overlay/temp/kinetic_blast(target.loc)
 	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
 	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
 

code/game/objects/items/weapons/storage/boxes.dm

@@ -391,59 +391,32 @@
 	icon_state = "monkeycubebox"
 	storage_slots = 7
 	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube")
-	New()
-		..()
-		for(var/i = 1; i <= 5; i++)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
-/obj/item/weapon/storage/box/farwacubes
+	var/monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube
+
+/obj/item/weapon/storage/box/monkeycubes/New()
+	..()
+	for(var/i in 1 to 5)
+		new monkey_cube_type(src)
+
+/obj/item/weapon/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
 	desc = "Drymate brand farwa cubes. Just add water!"
-	icon = 'icons/obj/food/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube")
-	New()
-		..()
-		for(var/i = 1; i <= 5; i++)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
+	monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
 
-/obj/item/weapon/storage/box/stokcubes
+/obj/item/weapon/storage/box/monkeycubes/stokcubes
 	name = "stok cube box"
 	desc = "Drymate brand stok cubes. Just add water!"
-	icon = 'icons/obj/food/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube")
-	New()
-		..()
-		for(var/i = 1; i <= 5; i++)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
+	monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
 
-/obj/item/weapon/storage/box/neaeracubes
+/obj/item/weapon/storage/box/monkeycubes/neaeracubes
 	name = "neaera cube box"
 	desc = "Drymate brand neaera cubes. Just add water!"
-	icon = 'icons/obj/food/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube")
-	New()
-		..()
-		for(var/i = 1; i <= 5; i++)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
+	monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
 
-
-/obj/item/weapon/storage/box/wolpincubes
+/obj/item/weapon/storage/box/monkeycubes/wolpincubes
 	name = "wolpin cube box"
 	desc = "Drymate brand wolpin cubes. Just add water!"
-	icon = 'icons/obj/food/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube")
-	New()
-		..()
-		for(var/i = 1; i <= 5; i++)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src)
-
+	monkey_cube_type = /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube
 
 /obj/item/weapon/storage/box/permits
 	name = "box of construction permits"

code/game/objects/items/weapons/tools.dm

@@ -266,22 +266,9 @@
 	else
 		return ..()
 
-/obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity)
-	if(!proximity) return
-	if(istype(O, /obj/structure/reagent_dispensers/fueltank) && in_range(src, O))
-		if(!welding)
-			O.reagents.trans_to(src, max_fuel)
-			to_chat(user, "<span class='notice'>[src] refueled.</span>")
-			playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
-			update_icon()
-			return
-		else
-			message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
-			log_game("[key_name(user)] triggered a fueltank explosion.")
-			to_chat(user, "<span class='warning'>That was stupid of you.</span>")
-			O.ex_act()
-			return
-
+/obj/item/weapon/weldingtool/afterattack(atom/O, mob/user, proximity)
+	if(!proximity)
+		return
 	if(welding)
 		remove_fuel(1)
 		var/turf/location = get_turf(user)
@@ -289,7 +276,9 @@
 
 		if(isliving(O))
 			var/mob/living/L = O
-			L.IgniteMob()
+			if(L.IgniteMob())
+				message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
+				log_game("[key_name(user)] set [key_name(L)] on fire")
 
 /obj/item/weapon/weldingtool/attack_self(mob/user)
 	toggle(user)

code/game/objects/items/weapons/weaponry.dm

@@ -23,18 +23,14 @@
 	slot_flags = SLOT_BELT
 	force = 2
 	throwforce = 1
-	sharp = 1
-	edge = 1
 	w_class = 3
+	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
-	suicide_act(mob/user)
-		to_chat(viewers(user), "<span class='suicide'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
-		return(BRUTELOSS)
-
-/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-	return ..()
+/obj/item/weapon/sord/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is trying to impale themself with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
+	"<span class='suicide'>You try to impale yourself with [src], but it's USELESS...</span>")
+	return SHAME
 
 /obj/item/weapon/claymore
 	name = "claymore"

code/game/objects/structures/crates_lockers/crates.dm

@@ -3,7 +3,7 @@
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/crates.dmi'
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"
@@ -490,7 +490,6 @@
 /obj/structure/closet/crate/large
 	name = "large crate"
 	desc = "A hefty metal crate."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
@@ -515,7 +514,6 @@
 /obj/structure/closet/crate/secure/large
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
@@ -572,3 +570,38 @@
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/hand_labeler(src)
 		new /obj/item/weapon/hand_labeler(src)
+
+/obj/structure/closet/crate/sci
+	name = "science crate"
+	desc = "A science crate."
+	icon_state = "scicrate"
+	icon_opened = "scicrateopen"
+	icon_closed = "scicrate"
+
+/obj/structure/closet/crate/secure/scisec
+	name = "secure science crate"
+	desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
+	icon_state = "scisecurecrate"
+	icon_opened = "scisecurecrateopen"
+	icon_closed = "scisecurecrate"
+
+/obj/structure/closet/crate/engineering
+	name = "engineering crate"
+	desc = "An engineering crate."
+	icon_state = "engicrate"
+	icon_opened = "engicrateopen"
+	icon_closed = "engicrate"
+
+/obj/structure/closet/crate/secure/engineering
+	name = "secure engineering crate"
+	desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
+	icon_state = "engisecurecrate"
+	icon_opened = "engisecurecrateopen"
+	icon_closed = "engisecurecrate"
+
+/obj/structure/closet/crate/engineering/electrical
+	name = "electrical engineering crate"
+	desc = "An electrical engineering crate."
+	icon_state = "electricalcrate"
+	icon_opened = "electricalcrateopen"
+	icon_closed = "electricalcrate"

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -1,8 +1,8 @@
 /obj/structure/largecrate
 	name = "large crate"
 	desc = "A hefty wooden crate."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "densecrate"
+	icon = 'icons/obj/crates.dmi'
+	icon_state = "largecrate"
 	density = 1
 	var/obj/item/weapon/paper/manifest/manifest
 
@@ -49,7 +49,6 @@
 		return attack_hand(user)
 
 /obj/structure/largecrate/mule
-	icon_state = "mulecrate"
 
 /obj/structure/largecrate/lisa
 	icon_state = "lisacrate"

code/game/objects/structures/curtains.dm

@@ -27,7 +27,7 @@
 	..()
 
 /obj/structure/curtain/proc/toggle()
-	opacity = !opacity
+	set_opacity(!opacity)
 	if(opacity)
 		icon_state = "closed"
 		layer = SHOWER_CLOSED_LAYER

code/game/objects/structures/door_assembly.dm

@@ -1,4 +1,4 @@
-obj/structure/door_assembly
+/obj/structure/door_assembly
 	icon = 'icons/obj/doors/door_assembly.dmi'
 
 	name = "Airlock Assembly"
@@ -14,119 +14,114 @@ obj/structure/door_assembly
 	var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
 	var/created_name = null
 
-	New()
-		update_state()
+/obj/structure/door_assembly/New()
+	update_state()
 
-obj/structure/door_assembly/door_assembly_com
+/obj/structure/door_assembly/door_assembly_com
 	base_icon_state = "com"
 	base_name = "Command Airlock"
 	glass_type = "/glass_command"
 	airlock_type = "/command"
 
-obj/structure/door_assembly/door_assembly_sec
+/obj/structure/door_assembly/door_assembly_sec
 	base_icon_state = "sec"
 	base_name = "Security Airlock"
 	glass_type = "/glass_security"
 	airlock_type = "/security"
 
-obj/structure/door_assembly/door_assembly_eng
+/obj/structure/door_assembly/door_assembly_eng
 	base_icon_state = "eng"
 	base_name = "Engineering Airlock"
 	glass_type = "/glass_engineering"
 	airlock_type = "/engineering"
 
-obj/structure/door_assembly/door_assembly_min
+/obj/structure/door_assembly/door_assembly_min
 	base_icon_state = "min"
 	base_name = "Mining Airlock"
 	glass_type = "/glass_mining"
 	airlock_type = "/mining"
 
-obj/structure/door_assembly/door_assembly_atmo
+/obj/structure/door_assembly/door_assembly_atmo
 	base_icon_state = "atmo"
 	base_name = "Atmospherics Airlock"
 	glass_type = "/glass_atmos"
 	airlock_type = "/atmos"
 
-obj/structure/door_assembly/door_assembly_research
+/obj/structure/door_assembly/door_assembly_research
 	base_icon_state = "res"
 	base_name = "Research Airlock"
 	glass_type = "/glass_research"
 	airlock_type = "/research"
 
-obj/structure/door_assembly/door_assembly_science
+/obj/structure/door_assembly/door_assembly_science
 	base_icon_state = "sci"
 	base_name = "Science Airlock"
 	glass_type = "/glass_science"
 	airlock_type = "/science"
 
-obj/structure/door_assembly/door_assembly_med
+/obj/structure/door_assembly/door_assembly_med
 	base_icon_state = "med"
 	base_name = "Medical Airlock"
 	glass_type = "/glass_medical"
 	airlock_type = "/medical"
 
-obj/structure/door_assembly/door_assembly_mai
+/obj/structure/door_assembly/door_assembly_mai
 	base_icon_state = "mai"
 	base_name = "Maintenance Airlock"
 	airlock_type = "/maintenance"
 	glass = -1
 
-obj/structure/door_assembly/door_assembly_ext
+/obj/structure/door_assembly/door_assembly_ext
 	base_icon_state = "ext"
 	base_name = "External Airlock"
 	airlock_type = "/external"
 	glass = -1
 
-obj/structure/door_assembly/door_assembly_fre
+/obj/structure/door_assembly/door_assembly_fre
 	base_icon_state = "fre"
 	base_name = "Freezer Airlock"
 	airlock_type = "/freezer"
 	glass = -1
 
-obj/structure/door_assembly/door_assembly_hatch
+/obj/structure/door_assembly/door_assembly_hatch
 	base_icon_state = "hatch"
 	base_name = "Airtight Hatch"
 	airlock_type = "/hatch"
 	glass = -1
 
-obj/structure/door_assembly/door_assembly_mhatch
+/obj/structure/door_assembly/door_assembly_mhatch
 	base_icon_state = "mhatch"
 	base_name = "Maintenance Hatch"
 	airlock_type = "/maintenance_hatch"
 	glass = -1
-
-obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
+	
+/obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
 	base_icon_state = "highsec"
 	base_name = "High Security Airlock"
 	airlock_type = "/highsecurity"
 	glass = -1
 
-obj/structure/door_assembly/door_assembly_shuttle
+/obj/structure/door_assembly/door_assembly_shuttle
 	base_icon_state = "shuttle"
 	base_name = "shuttle airlock"
 	airlock_type = "/shuttle"
 	glass = -1
 
-obj/structure/door_assembly/multi_tile
+/obj/structure/door_assembly/multi_tile
 	icon = 'icons/obj/doors/door_assembly2x1.dmi'
 	dir = EAST
 	var/width = 1
-/*Temporary until we get sprites.
-	glass_type = "/multi_tile/glass"
-	airlock_type = "/multi_tile/maint"
-	glass = 1*/
 	base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
 	airlock_type = "/multi_tile/glass"
 	glass = -1 //To prevent bugs in deconstruction process.
 
-
 /obj/structure/door_assembly/door_assembly_cult
 	base_name = "cult airlock assembly"
 	icon = 'icons/obj/doors/Doorcult.dmi'
 	base_icon_state ="construction"
 	airlock_type = "/cult"
 
-obj/structure/door_assembly/multi_tile/New()
+/obj/structure/door_assembly/multi_tile/New()
 	if(dir in list(EAST, WEST))
 		bound_width = width * world.icon_size
 		bound_height = world.icon_size
@@ -135,7 +130,7 @@ obj/structure/door_assembly/multi_tile/New()
 		bound_height = width * world.icon_size
 	update_state()
 
-obj/structure/door_assembly/multi_tile/Move()
+/obj/structure/door_assembly/multi_tile/Move()
 	. = ..()
 	if(dir in list(EAST, WEST))
 		bound_width = width * world.icon_size

code/game/objects/structures/mineral_doors.dm

@@ -191,7 +191,7 @@
 
 	Close()
 		..()
-		opacity = 0
+		set_opacity(0)
 
 /obj/structure/mineral_door/transparent/plasma
 	mineralType = "plasma"
@@ -228,7 +228,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -239,7 +239,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0
@@ -265,7 +265,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -280,7 +280,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0

code/game/objects/structures/spirit_board.dm

@@ -55,11 +55,10 @@
 	//lighting check
 	var/light_amount = 0
 	var/turf/T = get_turf(src)
-	var/atom/movable/lighting_overlay/LO = locate(/atom/movable/lighting_overlay) in T
-	if(LO)
-		light_amount = LO.get_clamped_lum(0.5)*10
+	if(T)
+		light_amount = T.get_lumcount(0.5) * 10
 	else
-		light_amount =  10
+		light_amount = 10
 
 	if(light_amount > 2)
 		to_chat(M, "<span class='warning'>It's too bright here to use [src.name]!</span>")

code/game/turfs/simulated/floor/mineral.dm

@@ -1,10 +1,18 @@
+/* In this file:
+ *
+ * Plasma floor
+ * Gold floor
+ * Silver floor
+ * Bananium floor
+ * Diamond floor
+ * Uranium floor
+ */
+
 /turf/simulated/floor/mineral
 	name = "mineral floor"
 	icon_state = ""
 	var/list/icons = list()
 
-
-
 /turf/simulated/floor/mineral/New()
 	..()
 	broken_states = list("[initial(icon_state)]_dam")
@@ -13,9 +21,145 @@
 	if(!..())
 		return 0
 	if(!broken && !burnt)
-		if( !(icon_state in icons) )
+		if(!(icon_state in icons))
 			icon_state = initial(icon_state)
 
+//PLASMA
+/turf/simulated/floor/mineral/plasma
+	name = "plasma floor"
+	icon_state = "plasma"
+	floor_tile = /obj/item/stack/tile/mineral/plasma
+	icons = list("plasma","plasma_dam")
+
+/turf/simulated/floor/mineral/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 300)
+		PlasmaBurn()
+
+/turf/simulated/floor/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
+	if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
+		message_admins("Plasma flooring was ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+		log_game("Plasma flooring was ignited by [key_name(user)] in ([x],[y],[z])")
+		ignite(is_hot(W))
+		return
+	..()
+
+/turf/simulated/floor/mineral/plasma/proc/PlasmaBurn()
+	make_plating()
+	atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 20)
+
+/turf/simulated/floor/mineral/plasma/proc/ignite(exposed_temperature)
+	if(exposed_temperature > 300)
+		PlasmaBurn()
+
+//GOLD
+/turf/simulated/floor/mineral/gold
+	name = "gold floor"
+	icon_state = "gold"
+	floor_tile = /obj/item/stack/tile/mineral/gold
+	icons = list("gold","gold_dam")
+
+//SILVER
+/turf/simulated/floor/mineral/silver
+	name = "silver floor"
+	icon_state = "silver"
+	floor_tile = /obj/item/stack/tile/mineral/silver
+	icons = list("silver","silver_dam")
+
+//BANANIUM
+/turf/simulated/floor/mineral/bananium
+	name = "bananium floor"
+	icon_state = "bananium"
+	floor_tile = /obj/item/stack/tile/mineral/bananium
+	icons = list("bananium","bananium_dam")
+	var/spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/Entered(mob/AM)
+	.=..()
+	if(!.)
+		if(istype(AM))
+			squeek()
+
+/turf/simulated/floor/mineral/bananium/attackby(obj/item/weapon/W, mob/user, params)
+	.=..()
+	if(!.)
+		honk()
+
+/turf/simulated/floor/mineral/bananium/attack_hand(mob/user)
+	.=..()
+	if(!.)
+		honk()
+
+/turf/simulated/floor/mineral/bananium/proc/honk()
+	if(!spam_flag)
+		spam_flag = 1
+		playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
+		spawn(20)
+			spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/proc/squeek()
+	if(!spam_flag)
+		spam_flag = 1
+		playsound(src, "clownstep", 50, 1)
+		spawn(10)
+			spam_flag = 0
+
+/turf/simulated/floor/mineral/bananium/airless
+	oxygen = 0.01
+	nitrogen = 0.01
+	temperature = TCMB
+
+//TRANQUILLITE
+/turf/simulated/floor/mineral/tranquillite
+	name = "silent floor"
+	icon_state = "tranquillite"
+	floor_tile = /obj/item/stack/tile/mineral/tranquillite
+	shoe_running_volume = 0
+	shoe_walking_volume = 0
+
+//DIAMOND
+/turf/simulated/floor/mineral/diamond
+	name = "diamond floor"
+	icon_state = "diamond"
+	floor_tile = /obj/item/stack/tile/mineral/diamond
+	icons = list("diamond","diamond_dam")
+
+//URANIUM
+/turf/simulated/floor/mineral/uranium
+	name = "uranium floor"
+	icon_state = "uranium"
+	floor_tile = /obj/item/stack/tile/mineral/uranium
+	icons = list("uranium","uranium_dam")
+	var/last_event = 0
+	var/active = null
+
+/turf/simulated/floor/mineral/uranium/Entered(mob/AM)
+	.=..()
+	if(!.)
+		if(istype(AM))
+			radiate()
+
+/turf/simulated/floor/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params)
+	.=..()
+	if(!.)
+		radiate()
+
+/turf/simulated/floor/mineral/uranium/attack_hand(mob/user)
+	.=..()
+	if(!.)
+		radiate()
+
+/turf/simulated/floor/mineral/uranium/proc/radiate()
+	if(!active)
+		if(world.time > last_event+15)
+			active = 1
+			for(var/mob/living/L in range(3,src))
+				L.apply_effect(1,IRRADIATE,0)
+			for(var/turf/simulated/floor/mineral/uranium/T in orange(1,src))
+				T.radiate()
+			last_event = world.time
+			active = 0
+			return
+
 // ALIEN ALLOY
 /turf/simulated/floor/mineral/abductor
 	name = "alien floor"
@@ -36,7 +180,6 @@
 /turf/simulated/floor/mineral/abductor/make_plating()
 	return ChangeTurf(/turf/simulated/floor/plating/abductor2)
 
-
 /turf/simulated/floor/plating/abductor2
 	name = "alien plating"
 	icon_state = "alienplating"

code/game/turfs/simulated/floor/misc_floor.dm

@@ -66,10 +66,3 @@
 
 /turf/simulated/floor/noslip/MakeSlippery()
 	return
-
-/turf/simulated/floor/silent
-	name = "silent floor"
-	icon_state = "silent"
-	floor_tile = /obj/item/stack/tile/silent
-	shoe_running_volume = 0
-	shoe_walking_volume = 0

code/game/turfs/turf.dm

@@ -24,8 +24,6 @@
 
 	var/PathNode/PNode = null //associated PathNode in the A* algorithm
 
-	var/dynamic_lighting = 1
-
 	flags = 0
 
 	var/image/obscured	//camerachunks
@@ -161,10 +159,11 @@
 		return src
 	var/old_opacity = opacity
 	var/old_dynamic_lighting = dynamic_lighting
-	var/list/old_affecting_lights = affecting_lights
+	var/old_affecting_lights = affecting_lights
 	var/old_lighting_overlay = lighting_overlay
 	var/old_blueprint_data = blueprint_data
 	var/old_obscured = obscured
+	var/old_corners = corners
 
 	BeforeChange()
 	if(air_master)
@@ -178,16 +177,19 @@
 	for(var/turf/space/S in range(W,1))
 		S.update_starlight()
 
-	lighting_overlay = old_lighting_overlay
+	recalc_atom_opacity()
 
-	affecting_lights = old_affecting_lights
-	if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting))
-		reconsider_lights()
-	if(dynamic_lighting != old_dynamic_lighting)
-		if(dynamic_lighting)
-			lighting_build_overlays()
-		else
-			lighting_clear_overlays()
+	if(lighting_overlays_initialised)
+		lighting_overlay = old_lighting_overlay
+		affecting_lights = old_affecting_lights
+		corners = old_corners
+		if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting))
+			reconsider_lights()
+		if(dynamic_lighting != old_dynamic_lighting)
+			if(dynamic_lighting)
+				lighting_build_overlay()
+			else
+				lighting_clear_overlay()
 
 	obscured = old_obscured
 
@@ -384,11 +386,6 @@
 	if(ticker)
 		cameranet.updateVisibility(src)
 
-/turf/proc/get_lumcount() //Gets the lighting level of a given turf.
-	if(lighting_overlay)
-		return lighting_overlay.get_clamped_lum()
-	return 1
-
 /turf/attackby(obj/item/C, mob/user, params)
 	if(can_lay_cable() && istype(C, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/coil = C

code/game/verbs/suicide.dm

@@ -77,6 +77,10 @@
 		if(held_item)
 			var/damagetype = held_item.suicide_act(src)
 			if(damagetype)
+				if(damagetype & SHAME)
+					adjustStaminaLoss(200)
+					suiciding = 0
+					return
 				do_suicide(damagetype, held_item)
 				return