Merge branch 'master' into PAIN

code/game/area/areas.dm

@@ -307,7 +307,7 @@
 
 	var/mob/living/L = A
 	if(!L.ckey)	return
-	if((oldarea.has_gravity == 0) && (newarea.has_gravity == 1) && (L.m_intent == "run")) // Being ready when you change areas gives you a chance to avoid falling all together.
+	if((oldarea.has_gravity == 0) && (newarea.has_gravity == 1) && (L.m_intent == MOVE_INTENT_RUN)) // Being ready when you change areas gives you a chance to avoid falling all together.
 		thunk(L)
 
 	// Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
@@ -344,7 +344,7 @@
 	if(istype(get_turf(M), /turf/space)) // Can't fall onto nothing.
 		return
 
-	if((istype(M,/mob/living/carbon/human/)) && (M.m_intent == "run")).
+	if((istype(M,/mob/living/carbon/human/)) && (M.m_intent == MOVE_INTENT_RUN)).
 		M.Stun(5)
 		M.Weaken(5)
 

code/game/atoms.dm

@@ -34,6 +34,9 @@
 	//Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
 
+	//Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
+	var/can_leave_fibers = TRUE
+
 	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.
@@ -469,4 +472,4 @@
 /atom/on_varedit(modified_var)
 	if(!Debug2)
 		admin_spawned = TRUE
-	..()
+	..()

code/game/dna/genes/goon_powers.dm

@@ -600,13 +600,13 @@
 				thoughts = "haunted by their own mortality"
 
 		switch(M.a_intent)
-			if(I_HELP)
+			if(INTENT_HELP)
 				to_chat(user, "<span class='notice'><b>Mood</b>: You sense benevolent thoughts from [M.name].</span>")
-			if(I_DISARM)
+			if(INTENT_DISARM)
 				to_chat(user, "<span class='notice'><b>Mood</b>: You sense cautious thoughts from [M.name].</span>")
-			if(I_GRAB)
+			if(INTENT_GRAB)
 				to_chat(user, "<span class='notice'><b>Mood</b>: You sense hostile thoughts from [M.name].</span>")
-			if(I_HARM)
+			if(INTENT_HARM)
 				to_chat(user, "<span class='notice'><b>Mood</b>: You sense cruel thoughts from [M.name].</span>")
 				for(var/mob/living/L in view(7,M))
 					if(L == M)

code/game/dna/genes/monkey.dm

@@ -42,9 +42,7 @@
 
 	H.set_species(H.species.primitive_form)
 
-	if(H.hud_used)
-		qdel(H.hud_used)
-		H.hud_used = null
+	QDEL_NULL(H.hud_used)
 
 	if(H.client)
 		H.hud_used = new /datum/hud/monkey(H, ui_style2icon(H.client.prefs.UI_style), H.client.prefs.UI_style_color, H.client.prefs.UI_style_alpha)
@@ -89,13 +87,11 @@
 	H.real_name = H.dna.real_name
 	H.name = H.real_name
 
-	if(H.hud_used)
-		qdel(H.hud_used)
-		H.hud_used = null
+	QDEL_NULL(H.hud_used)
 
 	if(H.client)
 		H.hud_used = new /datum/hud/human(H, ui_style2icon(H.client.prefs.UI_style), H.client.prefs.UI_style_color, H.client.prefs.UI_style_alpha)
 
 	to_chat(H, "<B>You are now a [H.species.name].</B>")
 
-	return H
+	return H

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

@@ -17,18 +17,21 @@
 	dna_cost = -1
 	genetic_damage = 1000
 
+	var/silent = FALSE
 	var/weapon_type
 	var/weapon_name_simple
 
 /obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
 	if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
 		qdel(user.l_hand)
-		user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
+		if(!silent)
+			user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
 		user.update_inv_l_hand()
 		return
 	if(istype(user.r_hand, weapon_type))
 		qdel(user.r_hand)
-		user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
+		if(!silent)
+			user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
 		user.update_inv_r_hand()
 		return
 	..(user, target)
@@ -37,7 +40,7 @@
 	if(!user.drop_item())
 		to_chat(user, "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!")
 		return
-	var/obj/item/W = new weapon_type(user)
+	var/obj/item/W = new weapon_type(user, silent)
 	user.put_in_hands(W)
 	return W
 
@@ -174,6 +177,178 @@
 		user.visible_message("<span class='warning'>[user] forces the airlock to open with \his [src]!</span>", "<span class='warning'>We force the airlock to open.</span>", "<span class='warning'>You hear a metal screeching sound.</span>")
 		A.open(2)
 
+/***************************************\
+|***********COMBAT TENTACLES*************|
+\***************************************/
+
+/obj/effect/proc_holder/changeling/weapon/tentacle
+	name = "Tentacle"
+	desc = "We ready a tentacle to grab items or victims with."
+	helptext = "We can use it once to retrieve a distant item. If used on living creatures, the effect depends on the intent: \
+	Help will simply drag them closer, Disarm will grab whatever they are holding instead of them, Grab will put the victim in our hold after catching it, \
+	and Harm will stun it, and stab it if we are also holding a sharp weapon. Cannot be used while in lesser form."
+	chemical_cost = 10
+	dna_cost = 2
+	genetic_damage = 5
+	req_human = 1
+	max_genetic_damage = 10
+	weapon_type = /obj/item/weapon/gun/magic/tentacle
+	weapon_name_simple = "tentacle"
+	silent = TRUE
+
+/obj/item/weapon/gun/magic/tentacle
+	name = "tentacle"
+	desc = "A fleshy tentacle that can stretch out and grab things or people."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "tentacle"
+	item_state = "tentacle"
+	flags = ABSTRACT | NODROP | NOBLUDGEON
+	w_class = WEIGHT_CLASS_HUGE
+	ammo_type = /obj/item/ammo_casing/magic/tentacle
+	fire_sound = 'sound/effects/splat.ogg'
+	force = 0
+	max_charges = 1
+	throwforce = 0 //Just to be on the safe side
+	throw_range = 0
+	throw_speed = 0
+
+/obj/item/weapon/gun/magic/tentacle/New(location,silent)
+	..()
+	if(ismob(loc))
+		if(!silent)
+			loc.visible_message("<span class='warning'>[loc.name]\'s arm starts stretching inhumanly!</span>", "<span class='warning'>Our arm twists and mutates, transforming it into a tentacle.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
+		else
+			to_chat(loc, "<span class='notice'>You prepare to extend a tentacle.</span>")
+
+/obj/item/weapon/gun/magic/tentacle/dropped()
+	. = ..()
+	qdel(src)
+
+/obj/item/weapon/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	to_chat(user, "<span class='warning'>The [name] is not ready yet.<span>")
+
+/obj/item/weapon/gun/magic/tentacle/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] coils [src] tightly around \his neck! It looks like \he's trying to commit suicide.</span>")
+	return (OXYLOSS)
+
+/obj/item/ammo_casing/magic/tentacle
+	name = "tentacle"
+	desc = "a tentacle."
+	projectile_type = /obj/item/projectile/tentacle
+	caliber = "tentacle"
+	icon_state = "tentacle_end"
+	var/obj/item/weapon/gun/magic/tentacle/gun //the item that shot it
+
+/obj/item/ammo_casing/magic/tentacle/New(obj/item/weapon/gun/magic/tentacle/tentacle_gun)
+	gun = tentacle_gun
+	..()
+
+/obj/item/ammo_casing/magic/tentacle/Destroy()
+	gun = null
+	return ..()
+
+/obj/item/projectile/tentacle
+	name = "tentacle"
+	icon_state = "tentacle_end"
+	pass_flags = PASSTABLE
+	damage = 0
+	damage_type = BRUTE
+	range = 8
+	hitsound = 'sound/weapons/thudswoosh.ogg'
+	var/chain
+	var/obj/item/ammo_casing/magic/tentacle/source //the item that shot it
+
+/obj/item/projectile/tentacle/New(obj/item/ammo_casing/magic/tentacle/tentacle_casing)
+	source = tentacle_casing
+	..()
+
+/obj/item/projectile/tentacle/fire(setAngle)
+	if(firer)
+		chain = firer.Beam(src, icon_state = "tentacle", time = INFINITY, maxdistance = INFINITY, beam_sleep_time = 1)
+	..()
+
+/obj/item/projectile/tentacle/proc/reset_throw(mob/living/carbon/human/H)
+	if(H.in_throw_mode)
+		H.throw_mode_off() //Don't annoy the changeling if he doesn't catch the item
+
+/mob/proc/tentacle_grab(mob/living/carbon/C)
+	if(Adjacent(C))
+		var/obj/item/weapon/grab/G = C.grabbedby(src,1)
+		if(istype(G))
+			G.state = GRAB_AGGRESSIVE //Instant aggressive grab
+
+/mob/proc/tentacle_stab(mob/living/carbon/C)
+	if(Adjacent(C))
+		var/obj/item/I = r_hand
+		if(!is_sharp(I))
+			I = l_hand
+		if(!is_sharp(I))
+			return
+
+		C.visible_message("<span class='danger'>[src] impales [C] with [I]!</span>", "<span class='userdanger'>[src] impales you with [I]!</span>")
+		C.apply_damage(I.force, BRUTE, "chest")
+		do_attack_animation(C)
+		add_blood(C)
+		playsound(get_turf(src), I.hitsound, 75, 1)
+
+
+/obj/item/projectile/tentacle/on_hit(atom/target, blocked = 0)
+	qdel(source.gun) //one tentacle only unless you miss
+	if(blocked >= 100)
+		return 0
+	var/mob/living/carbon/human/H = firer
+	if(istype(target, /obj/item))
+		var/obj/item/I = target
+		if(!I.anchored)
+			to_chat(firer, "<span class='notice'>You pull [I] towards yourself.</span>")
+			H.throw_mode_on()
+			I.throw_at(H, 10, 2)
+			. = 1
+
+	else if(isliving(target))
+		var/mob/living/L = target
+		if(!L.anchored && !L.throwing)//avoid double hits
+			if(iscarbon(L))
+				var/mob/living/carbon/C = L
+				switch(firer.a_intent)
+					if(INTENT_HELP)
+						C.visible_message("<span class='danger'>[L] is pulled by [H]'s tentacle!</span>","<span class='userdanger'>A tentacle grabs you and pulls you towards [H]!</span>")
+						C.throw_at(get_step_towards(H,C), 8, 2)
+						return 1
+
+					if(INTENT_DISARM)
+						var/obj/item/I = C.get_active_hand()
+						if(I)
+							if(C.drop_item())
+								C.visible_message("<span class='danger'>[I] is yanked out of [C]'s hand by [src]!</span>","<span class='userdanger'>A tentacle pulls [I] away from you!</span>")
+								on_hit(I) //grab the item as if you had hit it directly with the tentacle
+								return 1
+							else
+								to_chat(firer, "<span class='danger'>You can't seem to pry [I] out of [C]'s hands!<span>")
+								return 0
+						else
+							to_chat(firer, "<span class='danger'>[C] has nothing in hand to disarm!<span>")
+							return 0
+
+					if(INTENT_GRAB)
+						C.visible_message("<span class='danger'>[L] is grabbed by [H]'s tentacle!</span>","<span class='userdanger'>A tentacle grabs you and pulls you towards [H]!</span>")
+						C.throw_at(get_step_towards(H,C), 8, 2, callback=CALLBACK(H, /mob/proc/tentacle_grab, C))
+						return 1
+
+					if(INTENT_HARM)
+						C.visible_message("<span class='danger'>[L] is thrown towards [H] by a tentacle!</span>","<span class='userdanger'>A tentacle grabs you and throws you towards [H]!</span>")
+						C.throw_at(get_step_towards(H,C), 8, 2, callback=CALLBACK(H, /mob/proc/tentacle_stab, C))
+						return 1
+			else
+				L.visible_message("<span class='danger'>[L] is pulled by [H]'s tentacle!</span>","<span class='userdanger'>A tentacle grabs you and pulls you towards [H]!</span>")
+				L.throw_at(get_step_towards(H,L), 8, 2)
+				. = 1
+
+/obj/item/projectile/tentacle/Destroy()
+	qdel(chain)
+	source = null
+	return ..()
+
 
 /***************************************\
 |****************SHIELD*****************|

code/game/gamemodes/gameticker.dm

@@ -327,9 +327,7 @@ var/round_start_time = 0
 	//If its actually the end of the round, wait for it to end.
 	//Otherwise if its a verb it will continue on afterwards.
 	spawn(300)
-		if(cinematic)
-			qdel(cinematic)		//end the cinematic
-			cinematic = null
+		QDEL_NULL(cinematic)		//end the cinematic
 		if(temp_buckle)
 			qdel(temp_buckle)	//release everybody
 

code/game/gamemodes/miniantags/borer/borer.dm

@@ -68,7 +68,7 @@
 	icon_living = "brainslug"
 	icon_dead = "brainslug_dead"
 	speed = 5
-	a_intent = I_HARM
+	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	status_flags = CANPUSH
 	attacktext = "nips"

code/game/gamemodes/miniantags/guardian/guardian.dm

@@ -11,7 +11,7 @@
 	icon_living = "magicOrange"
 	icon_dead = "magicOrange"
 	speed = 0
-	a_intent = I_HARM
+	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	floating = 1
 	attack_sound = 'sound/weapons/punch1.ogg'
@@ -218,7 +218,7 @@
 //Fire. Low damage, low resistance, sets mobs on fire when bumping
 
 /mob/living/simple_animal/hostile/guardian/fire
-	a_intent = I_HELP
+	a_intent = INTENT_HELP
 	melee_damage_lower = 10
 	melee_damage_upper = 10
 	attack_sound = 'sound/items/Welder.ogg'
@@ -340,7 +340,7 @@
 //Healer
 
 /mob/living/simple_animal/hostile/guardian/healer
-	a_intent = I_HARM
+	a_intent = INTENT_HARM
 	friendly = "heals"
 	speed = 0
 	melee_damage_lower = 15
@@ -362,7 +362,7 @@
 	icon_state = "seal"
 	attacktext = "slaps"
 	speak_emote = list("barks")
-	a_intent = I_HARM
+	a_intent = INTENT_HARM
 	friendly = "heals"
 	speed = 0
 	melee_damage_lower = 0
@@ -398,7 +398,7 @@
 /mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
 	if(src.loc == summoner)
 		if(toggle)
-			a_intent = I_HARM
+			a_intent = INTENT_HARM
 			speed = 0
 			damage_transfer = 0.7
 			if(src.adminseal)
@@ -408,7 +408,7 @@
 			to_chat(src, "<span class='danger'><B>You switch to combat mode.</span></B>")
 			toggle = FALSE
 		else
-			a_intent = I_HELP
+			a_intent = INTENT_HELP
 			speed = 1
 			damage_transfer = 1
 			if(src.adminseal)
@@ -490,7 +490,7 @@
 	armour_penetration = 100
 
 /mob/living/simple_animal/hostile/guardian/ranged
-	a_intent = I_HELP
+	a_intent = INTENT_HELP
 	friendly = "quietly assesses"
 	melee_damage_lower = 10
 	melee_damage_upper = 10

code/game/gamemodes/miniantags/morph/morph.dm

@@ -11,7 +11,7 @@
 	icon_living = "morph"
 	icon_dead = "morph_dead"
 	speed = 2
-	a_intent = "harm"
+	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	status_flags = CANPUSH
 	pass_flags = PASSTABLE
@@ -168,4 +168,3 @@
 				eat(I)
 			return
 	target.attack_animal(src)
-

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

@@ -35,6 +35,7 @@
 	anchored = 1
 	mob_size = MOB_SIZE_TINY
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	speed = 1
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 
 	var/essence = 75 //The resource of revenants. Max health is equal to three times this amount

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

@@ -132,8 +132,7 @@
 	playsound(get_turf(src), 'sound/misc/exit_blood.ogg', 100, 1, -1)
 
 	flick("jauntup",animation)
-	qdel(holder)
-	holder = null
+	QDEL_NULL(holder)
 
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
@@ -171,4 +170,4 @@
 	return
 
 /obj/effect/dummy/slaughter/singularity_act()
-	return
+	return

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

@@ -14,7 +14,7 @@
 	icon_state = "daemon"
 	icon_living = "daemon"
 	speed = 1
-	a_intent = I_HARM
+	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	status_flags = CANPUSH
 	attack_sound = 'sound/misc/demon_attack1.ogg'
@@ -83,7 +83,7 @@
 /mob/living/simple_animal/slaughter/Life()
 	..()
 	if(boost<world.time)
-		speed = 2
+		speed = 1
 	else
 		speed = 0
 

code/game/gamemodes/vampire/vampire.dm

@@ -10,7 +10,7 @@
 	config_tag = "vampire"
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer")
-	protected_species = list("Machine", "Plasmaman")
+	protected_species = list("Machine")
 	required_players = 15
 	required_enemies = 1
 	recommended_enemies = 4
@@ -338,8 +338,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 		vampire_mind.current.create_attack_log("<span class='danger'>De-vampired</span>")
 		if(vampire_mind.vampire)
 			vampire_mind.vampire.remove_vampire_powers()
-			qdel(vampire_mind.vampire)
-			vampire_mind.vampire = null
+			QDEL_NULL(vampire_mind.vampire)
 		if(issilicon(vampire_mind.current))
 			to_chat(vampire_mind.current, "<span class='userdanger'>You have been turned into a robot! You can feel your powers fading away...</span>")
 		else
@@ -455,6 +454,5 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 		return
 
 	static_inventory -= vampire_blood_display
-	qdel(vampire_blood_display)
-	vampire_blood_display = null
+	QDEL_NULL(vampire_blood_display)
 	show_hud(hud_version)

code/game/gamemodes/vampire/vampire_powers.dm

@@ -215,7 +215,7 @@
 	stat_allowed = 1
 
 /obj/effect/proc_holder/spell/vampire/mob_aoe/glare/cast(list/targets, mob/user = usr)
-	user.visible_message("<span class='warning'><b>[user]'s eyes emit a blinding flash!</span>")
+	user.visible_message("<span class='warning'>[user]'s eyes emit a blinding flash!</span>")
 	if(istype(user:glasses, /obj/item/clothing/glasses/sunglasses/blindfold))
 		to_chat(user, "<span class='warning'>You're blindfolded!</span>")
 		return
@@ -242,9 +242,9 @@
 	user.regenerate_icons()
 
 /obj/effect/proc_holder/spell/vampire/self/screech
-	name = "Chiroptean Screech (30)"
+	name = "Chiropteran Screech (30)"
 	desc = "An extremely loud shriek that stuns nearby humans and breaks windows as well."
-	gain_desc = "You have gained the Chriopteran Screech ability which stuns anything with ears in a large radius and shatters glass in the process."
+	gain_desc = "You have gained the Chiropteran Screech ability which stuns anything with ears in a large radius and shatters glass in the process."
 	action_icon_state = "vampire_screech"
 	required_blood = 30
 

code/game/gamemodes/wizard/spellbook.dm

@@ -78,8 +78,7 @@
 		if(initial(S.name) == initial(aspell.name))
 			spell_levels = aspell.spell_level
 			user.mind.spell_list.Remove(aspell)
-			qdel(S)
-			S = null
+			QDEL_NULL(S)
 			return cost * (spell_levels+1)
 	return -1
 

code/game/jobs/job/job.dm

@@ -206,15 +206,15 @@
 			var/atom/placed_in = H.equip_or_collect(G.spawn_item(null, H.client.prefs.gear[G.display_name]))
 			if(istype(placed_in))
 				if(isturf(placed_in))
-					to_chat(H, "<span class='notice'>Placing \the [G] on [placed_in]!</span>")
+					to_chat(H, "<span class='notice'>Placing [G.display_name] on [placed_in]!</span>")
 				else
-					to_chat(H, "<span class='noticed'>Placing \the [G] in [placed_in.name]")
+					to_chat(H, "<span class='noticed'>Placing [G.display_name] in [placed_in.name]")
 				continue
 			if(H.equip_to_appropriate_slot(G))
-				to_chat(H, "<span class='notice'>Placing \the [G] in your inventory!</span>")
+				to_chat(H, "<span class='notice'>Placing [G.display_name] in your inventory!</span>")
 				continue
 			if(H.put_in_hands(G))
-				to_chat(H, "<span class='notice'>Placing \the [G] in your hands!</span>")
+				to_chat(H, "<span class='notice'>Placing [G.display_name] in your hands!</span>")
 				continue
 			to_chat(H, "<span class='danger'>Failed to locate a storage object on your mob, either you spawned with no hands free and no backpack or this is a bug.</span>")
 			qdel(G)

code/game/jobs/job/medical.dm

@@ -83,6 +83,7 @@
 	spawn_positions = 1
 	is_medical = 1
 	supervisors = "the chief medical officer"
+	department_head = list("Chief Medical Officer")
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom)
 	minimal_access = list(access_medical, access_morgue, access_maint_tunnels)

code/game/jobs/job_controller.dm

@@ -10,11 +10,13 @@ var/global/datum/controller/occupations/job_master
 	var/list/occupations = list()
 	var/list/name_occupations = list()	//Dict of all jobs, keys are titles
 	var/list/type_occupations = list()	//Dict of all jobs, keys are types
+	var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain
 	//Players who need jobs
 	var/list/unassigned = list()
 	//Debug info
 	var/list/job_debug = list()
 
+
 /datum/controller/occupations/proc/SetupOccupations(var/list/faction = list("Station"))
 	occupations = list()
 

code/game/jobs/job_exp.dm

@@ -7,6 +7,7 @@ var/global/list/role_playtime_requirements = list(
 	ROLE_SENTIENT = 5,
 	ROLE_ERT = 10, // High, because they're team-based, and we want ERT to be robust
 	ROLE_TRADER = 5,
+	ROLE_DRONE = 10, // High, because they're like mini engineering cyborgs that can ignore the AI, ventcrawl, and respawn themselves
 
 	// SOLO ANTAGS
 	ROLE_TRAITOR = 3,

code/game/machinery/cloning.dm

@@ -87,6 +87,10 @@
 /obj/machinery/clonepod/Destroy()
 	if(connected)
 		connected.pods -= src
+	for(var/s in sharedSoulhooks)
+		var/datum/soullink/S = s
+		S.removeSoulsharer(src) //If a sharer is destroy()'d, they are simply removed
+	sharedSoulhooks = null
 	QDEL_NULL(Radio)
 	QDEL_NULL(countdown)
 	QDEL_LIST(missing_organs)
@@ -288,6 +292,8 @@
 		to_chat(clonemind.current, {"<span class='notice'>Your body is
 			beginning to regenerate in a cloning pod. You will
 			become conscious when it is complete.</span>"})
+		// Set up a soul link with the dead body to catch a revival
+		soullink(/datum/soullink/soulhook, clonemind.current, src)
 
 	update_icon()
 
@@ -467,7 +473,12 @@
 		update_clone_antag(occupant)
 		to_chat(occupant, "<span class='notice'><b>There is a bright flash!</b><br>\
 			<i>You feel like a new being.</i></span>")
-		occupant.flash_eyes(visual = 1)
+		occupant.flash_eyes(visual = 1)
+		for(var/s in sharedSoulhooks)
+			var/datum/soullink/S = s
+			S.removeSoulsharer(src) //If a sharer is destroy()'d, they are simply removed
+		sharedSoulhooks = null
+
 
 	for(var/i in missing_organs)
 		qdel(i)
@@ -479,17 +490,22 @@
 	occupant = null
 	update_icon()
 
-/obj/machinery/clonepod/proc/malfunction()
+/obj/machinery/clonepod/proc/malfunction(go_easy = FALSE)
 	if(occupant)
 		connected_message("Critical Error!")
 		announce_radio_message("Critical error! Please contact a Thinktronic Systems technician, as your warranty may be affected.")
-		if(occupant.mind != clonemind)
-			clonemind.transfer_to(occupant)
-		occupant.grab_ghost() // We really just want to make you suffer.
-		to_chat(occupant, {"<span class='warning'><b>Agony blazes across your
-			consciousness as your body is torn apart.</b><br>
-			<i>Is this what dying is like? Yes it is.</i></span>"})
-		occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
+		for(var/s in sharedSoulhooks)
+			var/datum/soullink/S = s
+			S.removeSoulsharer(src) //If a sharer is destroy()'d, they are simply removed
+		sharedSoulhooks = null
+		if(!go_easy)
+			if(occupant.mind != clonemind)
+				clonemind.transfer_to(occupant)
+			occupant.grab_ghost() // We really just want to make you suffer.
+			to_chat(occupant, {"<span class='warning'><b>Agony blazes across your
+				consciousness as your body is torn apart.</b><br>
+				<i>Is this what dying is like? Yes it is.</i></span>"})
+			occupant << sound('sound/hallucinations/veryfar_noise.ogg',0,1,50)
 		for(var/i in missing_organs)
 			qdel(i)
 		missing_organs.Cut()
@@ -542,6 +558,11 @@
 		else
 	return
 
+/obj/machinery/clonepod/onSoullinkRevive(mob/living/L)
+	if(occupant && L == clonemind.current)
+		// The old body's back in shape, time to ditch the cloning one
+		malfunction(go_easy = TRUE)
+
 /obj/machinery/clonepod/proc/maim_clone(mob/living/carbon/human/H)
 	LAZYINITLIST(missing_organs)
 	for(var/i in missing_organs)

code/game/machinery/computer/HolodeckControl.dm

@@ -546,7 +546,7 @@
 	power_channel = ENVIRON
 
 /obj/machinery/readybutton/attack_ai(mob/user as mob)
-	to_chat(user, "The station AI is not to interact with these devices")
+	to_chat(user, "The station AI is not to interact with these devices.")
 	return
 
 /obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/game/machinery/computer/camera.dm

@@ -71,7 +71,9 @@
 	ui_interact(user)
 
 /obj/machinery/computer/security/attackby(obj/item/I, user as mob, params)
-	if(I.GetAccess()) // If hit by something with access.
+	if(isscrewdriver(I))
+		..()
+	else if(I.GetAccess()) // If hit by something with access.
 		attack_hand(user)
 	else
 		..()

code/game/machinery/computer/card.dm

@@ -20,8 +20,14 @@ var/time_last_changed_position = 0
 	//if set to -1: No cooldown... probably a bad idea
 	//if set to 0: Not able to close "original" positions. You can only close positions that you have opened before
 	var/change_position_cooldown = 60
-	//Jobs you cannot open new positions for
-	var/list/blacklisted = list(
+	// Jobs that do not appear in the list at all.
+	var/list/blacklisted_full = list(
+		/datum/job/ntnavyofficer,
+		/datum/job/ntspecops,
+		/datum/job/civilian
+	)
+	// Jobs that appear in the list, and you can prioritize, but not open/close slots for
+	var/list/blacklisted_partial = list(
 		/datum/job/ai,
 		/datum/job/cyborg,
 		/datum/job/captain,
@@ -37,12 +43,8 @@ var/time_last_changed_position = 0
 		/datum/job/brigdoc,
 		/datum/job/mechanic,
 		/datum/job/barber,
-		/datum/job/chaplain,
-		/datum/job/ntnavyofficer,
-		/datum/job/ntspecops,
-		/datum/job/civilian
+		/datum/job/chaplain
 	)
-
 	//The scaling factor of max total positions in relation to the total amount of people on board the station in %
 	var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
 
@@ -77,7 +79,7 @@ var/time_last_changed_position = 0
 /obj/machinery/computer/card/proc/format_job_slots()
 	var/list/formatted = list()
 	for(var/datum/job/job in job_master.occupations)
-		if(job_blacklisted(job))
+		if(job_blacklisted_full(job))
 			continue
 		if(!job_in_department(job))
 			continue
@@ -86,7 +88,9 @@ var/time_last_changed_position = 0
 			"current_positions" = job.current_positions,
 			"total_positions" = job.total_positions,
 			"can_open" = can_open_job(job),
-			"can_close" = can_close_job(job))))
+			"can_close" = can_close_job(job),
+			"can_prioritize" = can_prioritize_job(job)
+			)))
 
 	return formatted
 
@@ -137,14 +141,18 @@ var/time_last_changed_position = 0
 	nanomanager.update_uis(src)
 	attack_hand(user)
 
-//Check if you can't open a new position for a certain job
-/obj/machinery/computer/card/proc/job_blacklisted(datum/job/job)
-	return (job.type in blacklisted)
+//Check if you can't touch a job in any way whatsoever
+/obj/machinery/computer/card/proc/job_blacklisted_full(datum/job/job)
+	return (job.type in blacklisted_full)
+
+//Check if you can't open/close positions for a certain job
+/obj/machinery/computer/card/proc/job_blacklisted_partial(datum/job/job)
+	return (job.type in blacklisted_partial)
 
 //Logic check for Topic() if you can open the job
 /obj/machinery/computer/card/proc/can_open_job(datum/job/job)
 	if(job)
-		if(!job_blacklisted(job) && job_in_department(job, FALSE))
+		if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE))
 			if((job.total_positions <= player_list.len * (max_relative_positions / 100)))
 				var/delta = (world.time / 10) - time_last_changed_position
 				if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
@@ -156,7 +164,7 @@ var/time_last_changed_position = 0
 //Logic check for Topic() if you can close the job
 /obj/machinery/computer/card/proc/can_close_job(datum/job/job)
 	if(job)
-		if(!job_blacklisted(job) && job_in_department(job, FALSE))
+		if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE))
 			if(job.total_positions > job.current_positions)
 				var/delta = (world.time / 10) - time_last_changed_position
 				if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
@@ -165,6 +173,18 @@ var/time_last_changed_position = 0
 			return -1
 	return 0
 
+/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job)
+	if(job)
+		if(!job_blacklisted_full(job) && job_in_department(job, FALSE))
+			if(job in job_master.prioritized_jobs)
+				return 2
+			else
+				if(job_master.prioritized_jobs.len >= 3)
+					return 0
+				return 1
+	return -1
+
+
 /obj/machinery/computer/card/proc/job_in_department(datum/job/targetjob, includecivs = 1)
 	if(!scan || !scan.access)
 		return 0
@@ -488,7 +508,25 @@ var/time_last_changed_position = 0
 				opened_positions[edit_job_target]--
 				log_game("[key_name(usr)] has closed a job slot for job \"[j]\".")
 				nanomanager.update_uis(src)
-
+		if("prioritize_job")
+			// TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
+			if(is_authenticated(usr) && !target_dept)
+				var/priority_target = href_list["job"]
+				var/datum/job/j = job_master.GetJob(priority_target)
+				if(!j)
+					return 0
+				if(!job_in_department(j))
+					return 0
+				var/priority = TRUE
+				if(j in job_master.prioritized_jobs)
+					job_master.prioritized_jobs -= j
+					priority = FALSE
+				else if(job_master.prioritized_jobs.len < 3)
+					job_master.prioritized_jobs += j
+				else
+					return 0
+				log_game("[key_name(usr)] [priority ?  "prioritized" : "unprioritized"] the job \"[j.title]\".")
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 	if(modify)
 		modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 
@@ -499,7 +537,8 @@ var/time_last_changed_position = 0
 	circuit = /obj/item/weapon/circuitboard/card/centcom
 	req_access = list(access_cent_commander)
 	change_position_cooldown = -1
-	blacklisted = list()
+	blacklisted_full = list()
+	blacklisted_partial = list()
 
 /obj/machinery/computer/card/minor
 	name = "department management console"

code/game/machinery/computer/computer.dm

@@ -135,7 +135,7 @@
 	return
 
 /obj/machinery/computer/attack_alien(mob/living/user)
-	if(isalien(user) && user.a_intent == I_HELP)
+	if(isalien(user) && user.a_intent == INTENT_HELP)
 		var/mob/living/carbon/alien/humanoid/xeno = user
 		if(xeno.has_fine_manipulation)
 			return attack_hand(user)

code/game/machinery/computer/medical.dm

@@ -198,9 +198,7 @@
 							if("op")
 								active2.fields["b_type"] = "O+"
 				if("del_r2")
-					if(active2)
-						qdel(active2)
-						active2 = null
+					QDEL_NULL(active2)
 
 	if(href_list["scan"])
 		if(scan)
@@ -565,4 +563,4 @@
 #undef MED_DATA_MAINT
 #undef MED_DATA_RECORD
 #undef MED_DATA_V_DATA
-#undef MED_DATA_MEDBOT
+#undef MED_DATA_MEDBOT

code/game/machinery/computer/security.dm

@@ -156,11 +156,8 @@
 					for(var/datum/data/record/R in data_core.medical)
 						if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"])
 							qdel(R)
-					qdel(active1)
-					active1 = null
-				if(active2)
-					qdel(active2)
-					active2 = null
+					QDEL_NULL(active1)
+				QDEL_NULL(active2)
 				update_all_mob_security_hud()
 				screen = SEC_DATA_R_LIST
 			if("criminal")
@@ -485,10 +482,6 @@
 /obj/machinery/computer/secure_data/proc/setTemp(text, list/buttons = list())
 	temp = list("text" = text, "buttons" = buttons, "has_buttons" = buttons.len > 0)
 
-/obj/machinery/computer/secure_data/proc/update_all_mob_security_hud()
-	for(var/mob/living/carbon/human/H in mob_list)
-		H.sec_hud_set_security_status()
-
 /obj/machinery/computer/secure_data/proc/create_record_photo(datum/data/record/R)
 	// basically copy-pasted from the camera code but different enough that it has to be redone
 	var/icon/photoimage = get_record_photo(R)
@@ -560,4 +553,4 @@
 
 #undef SEC_DATA_R_LIST
 #undef SEC_DATA_MAINT
-#undef SEC_DATA_RECORD
+#undef SEC_DATA_RECORD

code/game/machinery/computer/skills.dm

@@ -111,8 +111,7 @@
 					for(var/datum/data/record/R in data_core.medical)
 						if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"])
 							qdel(R)
-					qdel(active1)
-					active1 = null
+					QDEL_NULL(active1)
 				screen = SKILL_DATA_R_LIST
 			if("rank")
 				if(active1)
@@ -322,4 +321,4 @@
 
 #undef SKILL_DATA_R_LIST
 #undef SKILL_DATA_MAINT
-#undef SKILL_DATA_RECORD
+#undef SKILL_DATA_RECORD

code/game/machinery/cryopod.dm

@@ -316,9 +316,7 @@
 
 		if(istype(W,/obj/item/device/pda))
 			var/obj/item/device/pda/P = W
-			if(P.id)
-				qdel(P.id)
-				P.id = null
+			QDEL_NULL(P.id)
 			qdel(P)
 
 		if(!preserve)
@@ -421,8 +419,7 @@
 			occupant.ghostize(0) // Players despawned too early may not re-enter the game
 		else
 			occupant.ghostize(1)
-	qdel(occupant)
-	occupant = null
+	QDEL_NULL(occupant)
 	name = initial(name)
 
 

code/game/machinery/doors/brigdoors.dm

@@ -29,32 +29,51 @@
 	var/timetoset = 0		// Used to set releasetime upon starting the timer
 	var/obj/item/device/radio/Radio
 	var/printed = 0
+	var/datum/data/record/prisoner
 	maptext_height = 26
 	maptext_width = 32
 
 /obj/machinery/door_timer/proc/print_report()
- 	var/logname = input(usr, "Name of the guilty?","[id] log name")
- 	var/logcharges = stripped_multiline_input(usr, "What have they been charged with?","[id] log charges")
+	var/logname = input(usr, "Name of the guilty?","[id] log name")
+	var/logcharges = stripped_multiline_input(usr, "What have they been charged with?","[id] log charges")
 
- 	if(!logname || !logcharges)
-  		return 0
+	if(!logname || !logcharges)
+		return 0
 
- 	for(var/obj/machinery/computer/prisoner/C in prisoncomputer_list)
- 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc)
- 			P.name = "[id] log - [logname] [worldtime2text()]"
- 			P.info =  "<center><b>[id] - Brig record</b></center><br><hr><br>"
- 			P.info += {"<center>[station_name()] - Security Department</center><br>
- 						<center><small><b>Admission data:</b></small></center><br>
- 						<small><b>Log generated at:</b>		[worldtime2text()]<br>
- 						<b>Detainee:</b>		[logname]<br>
- 						<b>Duration:</b>		[timetoset/10] seconds<br>
- 						<b>Charge(s):</b>	[logcharges]<br>
- 						<b>Arresting Officer:</b>		[usr.name]<br><hr><br>
- 						<small>This log file was generated automatically upon activation of a cell timer.</small>"}
+	for(var/obj/machinery/computer/prisoner/C in prisoncomputer_list)
+		var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc)
+		P.name = "[id] log - [logname] [worldtime2text()]"
+		P.info =  "<center><b>[id] - Brig record</b></center><br><hr><br>"
+		P.info += {"<center>[station_name()] - Security Department</center><br>
+						<center><small><b>Admission data:</b></small></center><br>
+						<small><b>Log generated at:</b>		[worldtime2text()]<br>
+						<b>Detainee:</b>		[logname]<br>
+						<b>Duration:</b>		[timetoset/10] seconds<br>
+						<b>Charge(s):</b>	[logcharges]<br>
+						<b>Arresting Officer:</b>		[usr.name]<br><hr><br>
+						<small>This log file was generated automatically upon activation of a cell timer.</small>"}
 
- 			playsound(C.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
- 			cell_logs += P
- 	return 1
+		playsound(C.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
+		cell_logs += P
+
+	var/datum/data/record/R = find_security_record("name", logname)
+	Radio.autosay("Detainee [logname] has been incarcerated for [timetoset/10] seconds for the charges of, '[logcharges]'. \
+	Arresting Officer: [usr.name].[R ? "" : " Detainee record not found, manual record update required."]", name, "Security", list(z))
+
+	if(R)
+		prisoner = R
+		R.fields["criminal"] = "Incarcerated"
+		var/mob/living/carbon/human/M = usr
+		var/rank = "UNKNOWN RANK"
+		if(istype(M) && M.wear_id)
+			var/obj/item/weapon/card/id/I = M.wear_id
+			rank = I.assignment
+		if(!R.fields["comments"] || !islist(R.fields["comments"])) //copied from security computer code because apparently these need to be initialized
+			R.fields["comments"] = list()
+		R.fields["comments"] += "Autogenerated by [name] on [current_date_string] [worldtime2text()]<BR>Sentenced to [timetoset/10] seconds for the charges of \"[logcharges]\" by [rank] [usr.name]."
+		update_all_mob_security_hud()
+
+	return 1
 
 /obj/machinery/door_timer/initialize()
 	..()
@@ -91,6 +110,7 @@
 /obj/machinery/door_timer/Destroy()
 	QDEL_NULL(Radio)
 	targets.Cut()
+	prisoner = null
 	return ..()
 
 //Main door timer loop, if it's timing and time is >0 reduce time by 1.
@@ -166,6 +186,10 @@
 	// Reset releasetime
 	releasetime = 0
 	printed = 0
+	if(prisoner)
+		prisoner.fields["criminal"] = "Released"
+		update_all_mob_security_hud()
+		prisoner = null
 
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(!door.density)
@@ -294,6 +318,7 @@
 			timer_start()
 		else
 			timer_end()
+			Radio.autosay("Timer stopped manually by [usr.name].", name, "Security", list(z))
 
 	else
 		if(href_list["tp"])  //adjust timer, close door if not already closed

code/game/machinery/doors/firedoor.dm

@@ -112,7 +112,7 @@
 	add_fingerprint(user)
 	user.changeNext_move(CLICK_CD_MELEE)
 
-	if(can_force && (!glass || user.a_intent != I_HELP))
+	if(can_force && (!glass || user.a_intent != INTENT_HELP))
 		user.visible_message("<span class='notice'>[user] begins forcing \the [src].</span>", \
 							 "<span class='notice'>You begin forcing \the [src].</span>")
 		if(do_after(user, force_open_time, target = src))

code/game/machinery/dye_generator.dm

@@ -88,7 +88,7 @@
 	overlays += I
 
 /obj/item/hair_dye_bottle/attack(mob/living/carbon/M as mob, mob/user as mob)
-	if(user.a_intent != "help")
+	if(user.a_intent != INTENT_HELP)
 		..()
 		return
 	if(!(M in view(1)))

code/game/machinery/flasher.dm

@@ -51,7 +51,7 @@
 /obj/machinery/flasher/attack_ai(mob/user)
 	if(anchored)
 		return flash()
-		
+
 /obj/machinery/flasher/attack_ghost(mob/user)
 	if(anchored && user.can_advanced_admin_interact())
 		return flash()
@@ -92,7 +92,7 @@
 
 	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M = AM
-		if((M.m_intent != "walk") && (anchored))
+		if((M.m_intent != MOVE_INTENT_WALK) && (anchored))
 			flash()
 
 /obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -119,11 +119,11 @@
 	anchored = 1.0
 	use_power = 1
 	idle_power_usage = 2
-	active_power_usage = 4			
-			
+	active_power_usage = 4
+
 /obj/machinery/flasher_button/attack_ai(mob/user as mob)
 	return attack_hand(user)
-	
+
 /obj/machinery/flasher_button/attack_ghost(mob/user)
 	if(user.can_advanced_admin_interact())
 		return attack_hand(user)
@@ -150,4 +150,4 @@
 	sleep(50)
 
 	icon_state = "launcherbtt"
-	active = 0
+	active = 0

code/game/machinery/hologram.dm

@@ -142,8 +142,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 
 /obj/machinery/hologram/holopad/proc/clear_holo()
 //	hologram.set_light(0)//Clear lighting.	//handled by the lighting controller when its ower is deleted
-	qdel(hologram)//Get rid of hologram.
-	hologram = null
+	QDEL_NULL(hologram)//Get rid of hologram.
 	if(master.holo == src)
 		master.holo = null
 	master = null//Null the master, since no-one is using it now.

code/game/machinery/holosign.dm

@@ -36,7 +36,7 @@
 /obj/machinery/holosign_switch
 	name = "holosign switch"
 	icon = 'icons/obj/power.dmi'
-	icon_state = "light1"
+	icon_state = "light0"
 	desc = "A remote control switch for holosign."
 	var/id = null
 	var/active = 0

code/game/machinery/newscaster.dm

@@ -68,6 +68,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 #define NEWSCASTER_D_NOTICE_FC	9	// D-Notice feed channel
 #define NEWSCASTER_W_ISSUE_H	10	// Wanted Issue handler
 #define NEWSCASTER_W_ISSUE		11	// STATIONWIDE WANTED ISSUE
+#define NEWSCASTER_JOBS			12	// Available jobs
 
 /obj/machinery/newscaster
 	name = "newscaster"
@@ -94,6 +95,21 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	var/silence = 0
 	var/temp = null
 	var/temp_back_screen = NEWSCASTER_MAIN
+	var/list/jobblacklist = list(
+		/datum/job/ai,
+		/datum/job/cyborg,
+		/datum/job/captain,
+		/datum/job/judge,
+		/datum/job/blueshield,
+		/datum/job/nanotrasenrep,
+		/datum/job/pilot,
+		/datum/job/brigdoc,
+		/datum/job/mechanic,
+		/datum/job/barber,
+		/datum/job/chaplain,
+		/datum/job/ntnavyofficer,
+		/datum/job/ntspecops,
+		/datum/job/civilian)
 
 	var/static/REDACTED = "<b class='bad'>\[REDACTED\]</b>"
 	light_range = 0
@@ -252,6 +268,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 			data["criminal"] = news_network.wanted_issue.author
 			data["description"] = news_network.wanted_issue.body
 			data["photo"] = news_network.wanted_issue.img ? icon2base64(news_network.wanted_issue.img) : 0
+		if(12)
+			var/list/jobs = list()
+			data["jobs"] = jobs
+			for(var/datum/job/job in job_master.occupations)
+				if(job_blacklisted(job))
+					continue
+				if(job.is_position_available())
+					jobs[++jobs.len] = list("title" = job.title)
 	return data
 
 /obj/machinery/newscaster/Topic(href, href_list)
@@ -535,6 +559,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 		if(can_scan(usr))
 			scan_user(usr) //Newscaster scans you
 
+	else if(href_list["jobs"])
+		screen = NEWSCASTER_JOBS
+
 	nanomanager.update_uis(src)
 	return 1
 
@@ -748,6 +775,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 
 ////////////////////////////////////helper procs
 
+/obj/machinery/newscaster/proc/job_blacklisted(datum/job/job)
+	return (job.type in jobblacklist)
+
 /obj/machinery/newscaster/proc/scan_user(mob/user)
 	if(ishuman(user))                      							 //User is a human
 		var/mob/living/carbon/human/human_user = user

code/game/machinery/programmable_unloader.dm

@@ -501,7 +501,7 @@
 				to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!")
 				return
 			var/damage = 0
-			if(H.a_intent != I_HARM)
+			if(H.a_intent != INTENT_HARM)
 				damage += rand(0,5)
 			else
 				damage += rand(0,10)

code/game/machinery/suit_storage_unit.dm

@@ -948,7 +948,7 @@
 			occupant.take_organ_damage(0,radiation_level*2 + rand(1,3))
 		if(radiation_level > 1)
 			occupant.take_organ_damage(0,radiation_level + rand(1,3))
-		occupant.radiation += radiation_level*10
+		occupant.apply_effect(radiation_level*10, IRRADIATE)
 
 /obj/machinery/suit_cycler/proc/finished_job()
 	var/turf/T = get_turf(src)

code/game/machinery/telecomms/traffic_control.dm

@@ -192,7 +192,7 @@
 	add_fingerprint(user)
 	user.set_machine(src)
 
-	if(!allowed(user) && !emagged)
+	if(!allowed(user) && !emagged && !user.can_admin_interact())
 		to_chat(user, "<span class='danger'>Access Denied.</span>")
 		return 0
 

code/game/machinery/washing_machine.dm

@@ -172,8 +172,7 @@
 					H.item_color = wash_color
 					H.name = new_softcap_name
 					H.desc = new_desc
-		qdel(crayon)
-		crayon = null
+		QDEL_NULL(crayon)
 
 
 	if( locate(/mob,contents) )

code/game/mecha/combat/marauder.dm

@@ -157,10 +157,10 @@
 		log_message("Toggled zoom mode.")
 		occupant_message("<font color='[zoom?"blue":"red"]'>Zoom mode [zoom?"en":"dis"]abled.</font>")
 		if(zoom)
-			occupant.client.view = 12
+			occupant.client.AddViewMod("mecha", 12)
 			to_chat(occupant, sound('sound/mecha/imag_enh.ogg',volume=50))
 		else
-			occupant.client.view = initial(occupant.client.view)
+			occupant.client.RemoveViewMod("mecha")
 
 
 

code/game/mecha/equipment/tools/work_tools.dm

@@ -51,7 +51,7 @@
 	else if(istype(target,/mob/living))
 		var/mob/living/M = target
 		if(M.stat == DEAD) return
-		if(chassis.occupant.a_intent == I_HARM)
+		if(chassis.occupant.a_intent == INTENT_HARM)
 			M.take_overall_damage(dam_force)
 			if(!M)
 				return
@@ -101,11 +101,11 @@
 	else if(istype(target,/mob/living))
 		var/mob/living/M = target
 		if(M.stat == DEAD) return
-		if(chassis.occupant.a_intent == I_HARM)
+		if(chassis.occupant.a_intent == INTENT_HARM)
 			target.visible_message("<span class='danger'>[chassis] destroys [target] in an unholy fury.</span>",
 								"<span class='userdanger'>[chassis] destroys [target] in an unholy fury.</span>")
 			M.gib()
-		/*if(chassis.occupant.a_intent == I_DISARM)
+		/*if(chassis.occupant.a_intent == INTENT_DISARM)
 			target.visible_message("<span class='danger'>[chassis] rips [target]'s arms off.</span>",
 								"<span class='userdanger'>[chassis] rips [target]'s arms off.</span>")*/
 		else

code/game/mecha/equipment/weapons/weapons.dm

@@ -77,6 +77,7 @@
 
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler
 	name = "CH-PD Disabler"
+	origin_tech = "combat=3"
 	projectile = /obj/item/projectile/beam/disabler
 	projectiles_per_shot = 2
 	projectile_delay = 1
@@ -104,7 +105,7 @@
 	name = "P-X Tesla Cannon"
 	desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine"
 	icon_state = "mecha_laser"
-	origin_tech = "materials=4;combat=5;magnets=4"
+	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
 	energy_drain = 500
 	projectile = /obj/item/projectile/energy/shock_revolver
 	fire_sound = 'sound/magic/lightningbolt.ogg'
@@ -129,7 +130,7 @@
 	name = "ZFI Immolation Beam Gun"
 	desc = "A weapon for combat exosuits. Fires beams of extreme heat that set targets on fire."
 	icon_state = "mecha_laser"
-	origin_tech = "materials=4;combat=4;magnets=3;plasmatech=2"
+	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
 	energy_drain = 80
 	projectile = /obj/item/projectile/beam/immolator
 	fire_sound = 'sound/weapons/laser3.ogg'

code/game/mecha/mecha.dm

@@ -748,7 +748,7 @@
 				to_chat(user, "There's not enough wire to finish the task.")
 		return
 
-	else if(isscrewdriver(W) && user.a_intent != I_HARM)
+	else if(isscrewdriver(W) && user.a_intent != INTENT_HARM)
 		if(hasInternalDamage(MECHA_INT_TEMP_CONTROL))
 			clearInternalDamage(MECHA_INT_TEMP_CONTROL)
 			to_chat(user, "<span class='notice'>You repair the damaged temperature controller.</span>")
@@ -776,7 +776,7 @@
 				to_chat(user, "<span class='notice'>There's already a powercell installed.</span>")
 		return
 
-	else if(iswelder(W) && user.a_intent != I_HARM)
+	else if(iswelder(W) && user.a_intent != INTENT_HARM)
 		var/obj/item/weapon/weldingtool/WT = W
 		if(health<initial(health))
 			if (WT.remove_fuel(0,user))
@@ -1309,7 +1309,7 @@
 		dir = dir_in
 
 	if(L && L.client)
-		L.client.view = world.view
+		L.client.RemoveViewMod("mecha")
 
 /////////////////////////
 ////// Access stuff /////

code/game/objects/buckling.dm

@@ -5,6 +5,7 @@
 	var/buckle_lying = -1 //bed-like behaviour, forces mob.lying = buckle_lying if != -1 //except -1 actually means "rotate 90 degrees to the left" as it is used by 1*buckle_lying.
 	var/buckle_requires_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes
 	var/mob/living/buckled_mob = null
+	var/buckle_offset = 0
 
 
 //Interaction

code/game/objects/effects/effect_system.dm

@@ -440,8 +440,7 @@ steam.start() -- spawns the effect
 	var/obj/chemholder
 
 	Destroy()
-		qdel(chemholder)
-		chemholder = null
+		QDEL_NULL(chemholder)
 		return ..()
 
 	New()

code/game/objects/effects/glowshroom.dm

@@ -162,6 +162,8 @@
 				G.endurance -= damage_to_do
 				G.CheckEndurance()
 			return
+	else if(I.sharp)
+		damage_to_do = I.force * 3 // wirecutter: 6->18, knife 10->30, hatchet 12->36
 	if(I.damtype != STAMINA)
 		endurance -= damage_to_do
 		CheckEndurance()

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

@@ -198,3 +198,27 @@
 				/obj/item/weapon/gun/energy/kinetic_accelerator = 1,
 				/obj/item/pizzabox = 3,
 				)
+
+/obj/effect/spawner/lootdrop/three_course_meal
+	name = "three course meal spawner"
+	lootcount = 3
+	lootdoubles = FALSE
+	var/soups = list(
+			/obj/item/weapon/reagent_containers/food/snacks/beetsoup,
+			/obj/item/weapon/reagent_containers/food/snacks/stew,
+			/obj/item/weapon/reagent_containers/food/snacks/hotchili,
+			/obj/item/weapon/reagent_containers/food/snacks/nettlesoup,
+			/obj/item/weapon/reagent_containers/food/snacks/meatballsoup)
+	var/salads = list(
+			/obj/item/weapon/reagent_containers/food/snacks/herbsalad,
+			/obj/item/weapon/reagent_containers/food/snacks/validsalad,
+			/obj/item/weapon/reagent_containers/food/snacks/aesirsalad)
+	var/mains = list(
+			/obj/item/weapon/reagent_containers/food/snacks/enchiladas,
+			/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat,
+			/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
+			/obj/item/weapon/reagent_containers/food/snacks/superbiteburger)
+
+/obj/effect/spawner/lootdrop/three_course_meal/New()
+	loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
+	. = ..()

code/game/objects/items.dm

@@ -558,3 +558,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 /obj/item/proc/is_crutch() //Does an item prop up a human mob and allow them to stand if they are missing a leg/foot?
 	return 0
+
+// Return true if you don't want regular throw handling
+/obj/item/proc/override_throw(mob/user, atom/target)
+	return FALSE
+
+/obj/item/proc/is_equivalent(obj/item/I)
+	return I == src

code/game/objects/items/cardboard_cutouts.dm

@@ -0,0 +1,188 @@
+//Cardboard cutouts! They're man-shaped and can be colored with a crayon to look like a human in a certain outfit, although it's limited, discolored, and obvious to more than a cursory glance.
+/obj/item/cardboard_cutout
+	name = "cardboard cutout"
+	desc = "A vaguely humanoid cardboard cutout. It's completely blank."
+	icon = 'icons/obj/cardboard_cutout.dmi'
+	icon_state = "cutout_basic"
+	burn_state = FLAMMABLE
+	w_class = WEIGHT_CLASS_BULKY
+	var/list/possible_appearances = list("Assistant", "Clown", "Mime",
+		"Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer",
+		"Deathsquad Officer", "Ian", "Slaughter Demon",
+		"Laughter Demon", "Xenomorph Maid", "Security Officer", "Terror Spider")
+	var/pushed_over = FALSE //If the cutout is pushed over and has to be righted
+	var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version
+	var/lastattacker = null
+
+/obj/item/cardboard_cutout/attack_hand(mob/living/user)
+	if(user.a_intent == INTENT_HELP || pushed_over)
+		return ..()
+	user.visible_message("<span class='warning'>[user] pushes over [src]!</span>", "<span class='danger'>You push over [src]!</span>")
+	playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+	push_over()
+
+/obj/item/cardboard_cutout/proc/push_over()
+	name = initial(name)
+	desc = "[initial(desc)] It's been pushed over."
+	icon = initial(icon)
+	icon_state = "cutout_pushed_over"
+	color = initial(color)
+	alpha = initial(alpha)
+	pushed_over = TRUE
+
+/obj/item/cardboard_cutout/attack_self(mob/living/user)
+	if(!pushed_over)
+		return
+	to_chat(user, "<span class='notice'>You right [src].</span>")
+	desc = initial(desc)
+	icon = initial(icon)
+	icon_state = initial(icon_state) //This resets a cutout to its blank state - this is intentional to allow for resetting
+	pushed_over = FALSE
+
+/obj/item/cardboard_cutout/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/toy/crayon))
+		change_appearance(I, user)
+		return
+	// Why yes, this does closely resemble mob and object attack code.
+	if(I.flags & NOBLUDGEON)
+		return
+	if(!I.force)
+		playsound(loc, 'sound/weapons/tap.ogg', 20, 1, -1)
+	else if(I.hitsound)
+		playsound(loc, I.hitsound, 20, 1, -1)
+
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
+
+	if(I.force)
+		user.visible_message("<span class='danger'>[user] has hit \
+			[src] with [I]!</span>", "<span class='danger'>You hit [src] \
+			with [I]!</span>")
+
+		if(prob(I.force))
+			push_over()
+
+/obj/item/cardboard_cutout/bullet_act(obj/item/projectile/P)
+	visible_message("<span class='danger'>[src] has been hit by [P]!</span>")
+	playsound(src, 'sound/weapons/slice.ogg', 50, 1)
+	if(prob(P.damage))
+		push_over()
+
+/obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user)
+	if(!crayon || !user)
+		return
+	if(istype(crayon, /obj/item/toy/crayon/spraycan))
+		var/obj/item/toy/crayon/spraycan/can = crayon
+		if(can.capped)
+			to_chat(user, "<span class='warning'>The cap is on [src] remove it first!</span>")
+			return
+	if(pushed_over)
+		to_chat(user, "<span class='warning'>Right [src] first!</span>")
+		return
+	var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances
+	if(!new_appearance || !crayon)
+		return
+	if(!do_after(user, 10, FALSE, src, TRUE))
+		return
+	user.visible_message("<span class='notice'>[user] gives [src] a new look.</span>", "<span class='notice'>Voila! You give [src] a new look.</span>")
+	alpha = 255
+	icon = initial(icon)
+	if(!deceptive)
+		color = "#FFD7A7"
+	switch(new_appearance)
+		if("Assistant")
+			name = "[pick(first_names_male)] [pick(last_names)]"
+			desc = "A cardboard cutout of an assistant."
+			icon_state = "cutout_greytide"
+		if("Clown")
+			name = pick(clown_names)
+			desc = "A cardboard cutout of a clown. You get the feeling that it should be in a corner."
+			icon_state = "cutout_clown"
+		if("Mime")
+			name = pick(mime_names)
+			desc = "...(A cardboard cutout of a mime.)"
+			icon_state = "cutout_mime"
+		if("Traitor")
+			name = "[pick("Unknown", "Captain")]"
+			desc = "A cardboard cutout of a traitor."
+			icon_state = "cutout_traitor"
+		if("Nuke Op")
+			name = "[pick("Unknown", "COMMS", "Telecomms", "AI", "stealthy op", "STEALTH", "sneakybeaky", "MEDIC", "Medic", "Gonk op")]"
+			desc = "A cardboard cutout of a nuclear operative."
+			icon_state = "cutout_fluke"
+		if("Cultist")
+			name = "Unknown"
+			desc = "A cardboard cutout of a cultist."
+			icon_state = "cutout_cultist"
+		//if("Clockwork Cultist")
+		//	name = "[random_name(pick(MALE,FEMALE))]"
+		//	desc = "A cardboard cutout of a servant of Ratvar."
+		//	icon_state = "cutout_servant"
+		if("Revolutionary")
+			name = "Unknown"
+			desc = "A cardboard cutout of a revolutionary."
+			icon_state = "cutout_viva"
+		if("Wizard")
+			name = "[pick(wizard_first)], [pick(wizard_second)]"
+			desc = "A cardboard cutout of a wizard."
+			icon_state = "cutout_wizard"
+		if("Shadowling")
+			name = "Unknown"
+			desc = "A cardboard cutout of a shadowling."
+			icon_state = "cutout_shadowling"
+		if("Xenomorph")
+			name = "alien hunter ([rand(1, 999)])"
+			desc = "A cardboard cutout of a xenomorph."
+			icon_state = "cutout_fukken_xeno"
+			if(prob(10))
+				alpha = 75 //Spooky sneaking!
+		if("Swarmer")
+			name = "Swarmer ([rand(1, 999)])"
+			desc = "A cardboard cutout of a swarmer."
+			icon_state = "cutout_swarmer"
+		//if("Ash Walker")
+		//	name = random_name(pick(MALE,FEMALE),"Unathi")
+		//	desc = "A cardboard cutout of an ash walker."
+		//	icon_state = "cutout_free_antag"
+		if("Deathsquad Officer")
+			name = pick(commando_names)
+			desc = "A cardboard cutout of a death commando."
+			icon_state = "cutout_deathsquad"
+		if("Ian")
+			name = "Ian"
+			desc = "A cardboard cutout of the HoP's beloved corgi."
+			icon_state = "cutout_ian"
+		if("Slaughter Demon")
+			name = "slaughter demon"
+			desc = "A cardboard cutout of a slaughter demon."
+			icon = 'icons/mob/mob.dmi'
+			icon_state = "daemon"
+			dir = "SOUTH"
+		if("Laughter Demon")
+			name = "laughter demon"
+			desc = "A cardboard cutout of a laughter demon."
+			icon = 'icons/mob/mob.dmi'
+			icon_state = "bowmon"
+			dir = "SOUTH"
+		if("Xenomorph Maid")
+			name = "lusty xenomorph maid ([rand(1, 999)])"
+			desc = "A cardboard cutout of a xenomorph maid."
+			icon_state = "cutout_lusty"
+		if("Security Officer")
+			name = "Private Security Officer"
+			desc = "A cardboard cutout of a private security officer."
+			icon_state = "cutout_ntsec"
+		if("Terror Spider")
+			name = "Gray Terror Spider"
+			desc = "A cardboard cutout of a terror spider."
+			icon = 'icons/mob/terrorspider.dmi'
+			icon_state = "terror_gray"
+			dir = "SOUTH"
+
+	return 1
+
+/obj/item/cardboard_cutout/setDir()
+	dir = SOUTH
+
+/obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed
+	deceptive = TRUE

code/game/objects/items/crayons.dm

@@ -73,7 +73,7 @@
 			temp = pick(graffiti)
 		else
 			temp = href_list["type"]
-	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+	if((usr.restrained() || usr.stat || !usr.is_in_active_hand(src)))
 		return
 	drawtype = temp
 	update_window(usr)
@@ -147,6 +147,29 @@
 	colour = "#DA00FF"
 	colourName = "purple"
 
+/obj/item/toy/crayon/random/New()
+	icon_state = pick(list("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple"))
+	switch(icon_state)
+		if("crayonred")
+			colour = "#DA0000"
+			colourName = "red"
+		if("crayonorange")
+			colour = "#FF9300"
+			colourName = "orange"
+		if("crayonyellow")
+			colour = "#FFF200"
+			colourName = "yellow"
+		if("crayongreen")
+			colour = "#A8E61D"
+			colourName = "green"
+		if("crayonblue")
+			colour = "#00B7EF"
+			colourName = "blue"
+		if("crayonpurple")
+			colour = "#DA00FF"
+			colourName = "purple"
+	..()
+
 /obj/item/toy/crayon/white
 	icon_state = "crayonwhite"
 	colour = "#FFFFFF"
@@ -167,7 +190,7 @@
 	..()
 
 /obj/item/toy/crayon/mime/Topic(href,href_list)
-	if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+	if((usr.restrained() || usr.stat || usr.is_in_active_hand(src)))
 		return
 	if(href_list["color"])
 		if(colour != "#FFFFFF")
@@ -195,7 +218,7 @@
 
 	if(href_list["color"])
 		var/temp = input(usr, "Please select colour.", "Crayon colour") as color
-		if((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+		if((usr.restrained() || usr.stat || usr.is_in_active_hand(src)))
 			return
 		colour = temp
 		update_window(usr)
@@ -214,7 +237,7 @@
 
 /obj/item/toy/crayon/spraycan/New()
 	..()
-	name = "NanoTrasen-brand Rapid Paint Applicator"
+	name = "Nanotrasen-brand Rapid Paint Applicator"
 	update_icon()
 
 /obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob)

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

@@ -74,6 +74,21 @@
 		if(O.trace_chemicals[V] > 0 && !chemtraces.Find(V))
 			chemtraces += V
 
+/obj/item/weapon/autopsy_scanner/attackby(obj/item/weapon/P, mob/user)
+	if(istype(P, /obj/item/weapon/pen))
+		var/dead_name = input("Insert name of deceased individual")
+		var/dead_rank = input("Insert rank of deceased individual")
+		var/dead_tod = input("Insert time of death")
+		var/dead_cause = input("Insert cause of death")
+		var/dead_chems = input("Insert any chemical traces")
+		var/dead_notes = input("Insert any relevant notes")
+		var/obj/item/weapon/paper/R = new(user.loc)
+		R.name = "Official Coroner's Report - [dead_name]"
+		R.info = "<b>NanoTrasen Science Station Cyberiad - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
+		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
+		sleep(10)
+		user.put_in_hands(R)
+
 /obj/item/weapon/autopsy_scanner/attack_self(mob/user)
 	if(!wdata.len && !chemtraces.len)
 		return
@@ -181,4 +196,4 @@
 	M.visible_message("<span class='warning'>[user] scans the wounds on [M]'s [S] with [src]</span>")
 
 	add_data(S)
-	return 1
+	return 1

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

@@ -43,8 +43,7 @@
 	if(active_dummy)
 		eject_all()
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
-		qdel(active_dummy)
-		active_dummy = null
+		QDEL_NULL(active_dummy)
 		to_chat(usr, "<span class='notice'>You deactivate \the [src].</span>")
 		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'

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

@@ -39,6 +39,11 @@
 			overcharged = 1
 			overlays += "overcharge"
 
+/obj/item/device/flash/random/New()
+	..()
+	if(prob(25))
+		broken = 1
+		icon_state = "[initial(icon_state)]burnt"
 
 /obj/item/device/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
 	broken = 1

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

@@ -37,6 +37,7 @@ var/global/list/default_medbay_channels = list(
 	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
 	var/subspace_transmission = 0
 	var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
+	var/disable_timer = 0 //How many times this is disabled by EMPs
 
 	var/is_special = 0 //For electropacks mostly, skips Topic() checks
 
@@ -599,12 +600,25 @@ var/global/list/default_medbay_channels = list(
 	else return
 
 /obj/item/device/radio/emp_act(severity)
+	on = 0
+	disable_timer++
+	addtimer(src, "enable_radio", rand(100, 200))
+
+	if(listening)
+		visible_message("<span class='warning'>[src] buzzes violently!</span>")
+
 	broadcasting = 0
 	listening = 0
 	for(var/ch_name in channels)
 		channels[ch_name] = 0
 	..()
 
+/obj/item/device/radio/proc/enable_radio()
+	if(disable_timer > 0)
+		disable_timer--
+	if(!disable_timer)
+		on = 1
+
 ///////////////////////////////
 //////////Borg Radios//////////
 ///////////////////////////////

code/game/objects/items/policetape.dm

@@ -162,7 +162,7 @@ var/list/tape_roll_applications = list()
 	breaktape(W, user)
 
 /obj/item/tape/attack_hand(mob/user as mob)
-	if(user.a_intent == I_HELP && src.allowed(user))
+	if(user.a_intent == INTENT_HELP && src.allowed(user))
 		user.visible_message("<span class=notice>[user] lifts [src], allowing passage.</span>", "<span class=notice>You lift [src], allowing passage.</span>")
 		src.density = 0
 		spawn(200)
@@ -174,7 +174,7 @@ var/list/tape_roll_applications = list()
 	breaktape(/obj/item/weapon/wirecutters,user)
 
 /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
-	if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
+	if(user.a_intent == INTENT_HELP && ((!can_puncture(W) && src.allowed(user))))
 		to_chat(user, "You can't break the [src] with that!")
 		return
 	user.visible_message("<span class=warning>[user] breaks the [src]!</span>", "<span class=warning>You break the [src]!</span>")

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

@@ -37,8 +37,7 @@
 	R.hands.icon_state = "nomod"
 	R.icon_state = "robot"
 	R.module.remove_subsystems_and_actions(R)
-	qdel(R.module)
-	R.module = null
+	QDEL_NULL(R.module)
 
 	R.camera.network.Remove(list("Engineering", "Medical", "Mining Outpost"))
 	R.rename_character(R.real_name, R.get_default_name("Default"))

code/game/objects/items/stacks/rods.dm

@@ -55,7 +55,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
 						 "<span class='notice'>You shape [src] into metal with the welding tool.</span>", \
 						 "<span class='italics'>You hear welding.</span>")
 
-			var/replace = user.get_inactive_hand() == src
+			var/replace = user.is_in_inactive_hand(src)
 			use(2)
 			if(get_amount() <= 0 && replace)
 				user.unEquip(src, 1)

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

@@ -237,6 +237,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
 	new /datum/stack_recipe("folder", /obj/item/weapon/folder),
 	new /datum/stack_recipe("cardboard tube", /obj/item/weapon/c_tube),
 	new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4),
+	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5),
 )
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap

code/game/objects/items/stacks/stack.dm

@@ -36,6 +36,23 @@
 /obj/item/stack/attack_self(mob/user)
 	list_recipes(user)
 
+/obj/item/stack/attack_self_tk(mob/user)
+	list_recipes(user)
+
+/obj/item/stack/attack_tk(mob/user)
+	if(user.stat || !isturf(loc)) return
+	// Allow remote stack splitting, because telekinetic inventory managing
+	// is really cool
+	if(src in user.tkgrabbed_objects)
+		var/obj/item/stack/F = split(user, 1)
+		F.attack_tk(user)
+		if(src && user.machine == src)
+			spawn(0)
+				interact(user)
+	else
+		..()
+
+
 /obj/item/stack/proc/list_recipes(mob/user, recipes_sublist)
 	if(!recipes)
 		return
@@ -107,7 +124,7 @@
 
 /obj/item/stack/Topic(href, href_list)
 	..()
-	if(usr.incapacitated() || usr.get_active_hand() != src)
+	if(usr.incapacitated() || !usr.is_in_active_hand(src))
 		return 0
 
 	if(href_list["sublist"] && !href_list["make"])
@@ -124,6 +141,7 @@
 
 		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
+		var/atom/creation_loc = (loc == usr) ? usr.loc : loc
 		if(!multiplier)
 			multiplier = 1
 
@@ -134,11 +152,11 @@
 				to_chat(usr, "<span class='warning'>You haven't got enough [src] to build \the [R.title]!</span>")
 			return 0
 
-		if(R.one_per_turf && (locate(R.result_type) in usr.loc))
+		if(R.one_per_turf && (locate(R.result_type) in creation_loc))
 			to_chat(usr, "<span class='warning'>There is another [R.title] here!</span>")
 			return 0
 
-		if(R.on_floor && !istype(usr.loc, /turf/simulated))
+		if(R.on_floor && !istype(creation_loc, /turf/simulated))
 			to_chat(usr, "<span class='warning'>\The [R.title] must be constructed on the floor!</span>")
 			return 0
 
@@ -150,7 +168,7 @@
 		if(amount < R.req_amount * multiplier)
 			return
 
-		var/atom/O = new R.result_type(usr.loc)
+		var/atom/O = new R.result_type(creation_loc)
 		O.dir = usr.dir
 		if(R.max_res_amount > 1)
 			var/obj/item/stack/new_item = O
@@ -215,7 +233,7 @@
 	return max_amount
 
 /obj/item/stack/proc/split(mob/user, amt)
-	var/obj/item/stack/F = new type(user, amt)
+	var/obj/item/stack/F = new type(loc, amt)
 	F.copy_evidences(src)
 	if(isliving(user))
 		add_fingerprint(user)
@@ -224,7 +242,7 @@
 	return F
 
 /obj/item/stack/attack_hand(mob/user)
-	if(user.get_inactive_hand() == src)
+	if(user.is_in_inactive_hand(src))
 		var/obj/item/stack/F = split(user, 1)
 		user.put_in_hands(F)
 		if(src && usr.machine == src)
@@ -241,7 +259,7 @@
 			return 1
 
 		var/to_transfer
-		if(user.get_inactive_hand() == src)
+		if(user.is_in_inactive_hand(src))
 			var/desired = input("How much would you like to transfer from this stack?", "How much?", 1) as null|num
 			if(!desired)
 				return
@@ -267,4 +285,4 @@
 	fingerprints		= from.fingerprints
 	fingerprintshidden	= from.fingerprintshidden
 	fingerprintslast	= from.fingerprintslast
-	//TODO bloody overlay
+	//TODO bloody overlay

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

@@ -100,6 +100,11 @@
 	turf_type = /turf/simulated/floor/carpet
 	burn_state = FLAMMABLE
 
+/obj/item/stack/tile/carpet/black
+	name = "black carpet"
+	icon_state = "tile-carpet-black"
+	turf_type = /turf/simulated/floor/carpet/black
+
 //Plasteel
 /obj/item/stack/tile/plasteel
 	name = "floor tiles"

code/game/objects/items/toys.dm

@@ -283,7 +283,7 @@
 /obj/item/toy/snappop/Crossed(H as mob|obj)
 	if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
-		if(issilicon(H) || M.m_intent == "run")
+		if(issilicon(H) || M.m_intent == MOVE_INTENT_RUN)
 			to_chat(M, "<span class='danger'>You step on the snap pop!</span>")
 			pop_burst(2, 0)
 
@@ -1276,7 +1276,7 @@ obj/item/toy/cards/deck/syndicate/black
 
 /obj/item/toy/minigibber
 	name = "miniature gibber"
-	desc = "A miniature recreation of NanoTrasen's famous meat grinder."
+	desc = "A miniature recreation of Nanotrasen's famous meat grinder."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "minigibber"
 	attack_verb = list("grinded", "gibbed")
@@ -1288,8 +1288,7 @@ obj/item/toy/cards/deck/syndicate/black
 
 	if(stored_minature)
 		to_chat(user, "<span class='danger'>\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!</span>")
-		qdel(stored_minature)
-		stored_minature = null
+		QDEL_NULL(stored_minature)
 		playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1)
 		cooldown = world.time
 

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

@@ -6,7 +6,7 @@ RCD
 */
 /obj/item/weapon/rcd
 	name = "rapid-construction-device (RCD)"
-	desc = "A device used to rapidly build and deconstruct walls and floors."
+	desc = "A device used to rapidly build and deconstruct walls, floors and airlocks."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "rcd"
 	opacity = 0
@@ -68,7 +68,7 @@ RCD
 	if(istype(W, /obj/item/weapon/rcd_ammo))
 		var/obj/item/weapon/rcd_ammo/R = W
 		if((matter + R.ammoamt) > max_matter)
-			to_chat(user, "<span class='notice'>The RCD cant hold any more matter-units.</span>")
+			to_chat(user, "<span class='notice'>The RCD can't hold any more matter-units.</span>")
 			return
 		matter += R.ammoamt
 		user.drop_item()
@@ -84,6 +84,9 @@ RCD
 	//Change the mode
 	ui_interact(user)
 
+/obj/item/weapon/rcd/attack_self_tk(mob/user)
+	ui_interact(user)
+
 /obj/item/weapon/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
@@ -199,7 +202,8 @@ RCD
 					to_chat(user, "Building Wall ...")
 					playsound(loc, 'sound/machines/click.ogg', 50, 1)
 					if(do_after(user, 20 * toolspeed, target = A))
-						if(!useResource(3, user)) return 0
+						if(!useResource(3, user))
+							return 0
 						activate()
 						var/turf/AT = A
 						AT.ChangeTurf(/turf/simulated/wall)
@@ -212,7 +216,10 @@ RCD
 					to_chat(user, "Building Airlock...")
 					playsound(loc, 'sound/machines/click.ogg', 50, 1)
 					if(do_after(user, 50 * toolspeed, target = A))
-						if(!useResource(10, user)) return 0
+						for(var/obj/machinery/door/airlock/D in A.contents)
+							return 0
+						if(!useResource(10, user))
+							return 0
 						activate()
 						var/obj/machinery/door/airlock/T = new door_type(A)
 						T.name = door_name
@@ -233,7 +240,8 @@ RCD
 					to_chat(user, "Deconstructing Wall...")
 					playsound(loc, 'sound/machines/click.ogg', 50, 1)
 					if(do_after(user, 40 * toolspeed, target = A))
-						if(!useResource(5, user)) return 0
+						if(!useResource(5, user))
+							return 0
 						activate()
 						var/turf/AT = A
 						AT.ChangeTurf(/turf/simulated/floor/plating)
@@ -245,7 +253,8 @@ RCD
 					to_chat(user, "Deconstructing Floor...")
 					playsound(loc, 'sound/machines/click.ogg', 50, 1)
 					if(do_after(user, 50 * toolspeed, target = A))
-						if(!useResource(5, user)) return 0
+						if(!useResource(5, user))
+							return 0
 						activate()
 						var/turf/AT = A
 						AT.ChangeTurf(/turf/space)
@@ -257,7 +266,8 @@ RCD
 					to_chat(user, "Deconstructing Airlock...")
 					playsound(loc, 'sound/machines/click.ogg', 50, 1)
 					if(do_after(user, 50 * toolspeed, target = A))
-						if(!useResource(20, user)) return 0
+						if(!useResource(20, user))
+							return 0
 						activate()
 						qdel(A)
 						return 1
@@ -361,7 +371,7 @@ RCD
 
 /obj/item/weapon/rcd/borg/New()
 	..()
-	desc = "A device used to rapidly build and deconstruct walls and floors."
+	desc = "A device used to rapidly build and deconstruct walls, floors and airlocks."
 	canRwall = 1
 
 

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

@@ -44,7 +44,7 @@
 			if(armed)
 				if(istype(AM, /mob/living/carbon) && !istype(AM, /mob/living/carbon/brain))
 					var/mob/living/carbon/C = AM
-					if(C.m_intent != "walk")
+					if(C.m_intent != MOVE_INTENT_WALK)
 						src.visible_message("The [src.name] beeps, \"Running on wet floors is hazardous to your health.\"")
 						explosion(src.loc,-1,0,2)
 						if(ishuman(C))

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

@@ -19,7 +19,7 @@
 	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
 	if(user.client && (target in user.client.screen))
 		to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>")
-	else if(target == user && user.a_intent == I_GRAB && ishuman(target))
+	else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target))
 		var/mob/living/carbon/human/muncher = user
 		if(muncher && muncher.get_species() == "Drask")
 			to_chat(user, "You take a bite of the [src.name]. Delicious!")

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

@@ -319,7 +319,7 @@
 		to_chat(user, "<span class='notice'>The instructions on [defib] don't mention how to revive that...</span>")
 		return
 	else
-		if(user.a_intent == I_HARM && !defib.safety)
+		if(user.a_intent == INTENT_HARM && !defib.safety)
 			busy = 1
 			H.visible_message("<span class='danger'>[user] has touched [H.name] with [src]!</span>", \
 					"<span class='userdanger'>[user] has touched [H.name] with [src]!</span>")
@@ -349,8 +349,7 @@
 				H.key = ghost.key
 				log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), src)
 
-				qdel(ghost)
-				ghost = null
+				QDEL_NULL(ghost)
 			var/tplus = world.time - H.timeofdeath
 			var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
 			var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting
@@ -461,7 +460,7 @@
 		to_chat(user, "<span class='notice'>This unit is only designed to work on humanoid lifeforms.</span>")
 		return
 	else
-		if(user.a_intent == I_HARM  && !safety)
+		if(user.a_intent == INTENT_HARM  && !safety)
 			busy = 1
 			H.visible_message("<span class='danger'>[user] has touched [H.name] with [src]!</span>", \
 					"<span class='userdanger'>[user] has touched [H.name] with [src]!</span>")
@@ -495,8 +494,7 @@
 				H.key = ghost.key
 				log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), H)
 
-				qdel(ghost)
-				ghost = null
+				QDEL_NULL(ghost)
 			var/tplus = world.time - H.timeofdeath
 			var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
 			var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting

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

@@ -61,7 +61,7 @@
 		nadeassembly.attack_self(user)
 		return
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
-	if(user.get_active_hand() == src)
+	if(user.is_in_active_hand(src))
 		newtime = Clamp(newtime, 10, 60000)
 		det_time = newtime
 		to_chat(user, "Timer set for [det_time] seconds.")

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

@@ -62,7 +62,7 @@
 /obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag)
 	if(flag) return // too close
 	// Make sure our user is still holding us
-	if(user && user.get_active_hand() == src)
+	if(user && user.is_in_active_hand(src))
 		var/turf/target_turf = get_turf(target)
 		if(target_turf)
 			var/turflist = getline(user, target_turf)

code/game/objects/items/weapons/grenades/grenade.dm

@@ -32,7 +32,7 @@
 /*/obj/item/weapon/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
 	if(istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container
 	if(istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..()
-	if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc)
+	if((user.is_in_active_hand(src)) && (!active) && (clown_check(user)) && target.loc != src.loc)
 		to_chat(user, "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>")
 		active = 1
 		icon_state = initial(icon_state) + "_active"

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

@@ -104,6 +104,10 @@
 /obj/item/weapon/restraints/handcuffs/cable/white
 	color = COLOR_WHITE
 
+/obj/item/weapon/restraints/handcuffs/cable/random/New()
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	..()
+
 /obj/item/weapon/restraints/handcuffs/alien
 	icon_state = "handcuffAlien"
 

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

@@ -0,0 +1,50 @@
+
+//Highlander Style Martial Art
+//	Prevents use of guns, but makes the highlander impervious to ranged attacks. Their bravery in battle shields them from the weapons of COWARDS!
+
+/datum/martial_art/highlander
+	name = "Highlander Style"
+	deflection_chance = 100
+	no_guns = TRUE
+	no_guns_message = "You'd never stoop so low as to use the weapon of a COWARD!"
+
+
+//Highlander Claymore
+//	Grants the wielder the Highlander Style Martial Art
+
+/obj/item/weapon/claymore/highlander
+	name = "Highlander Claymore"
+	desc = "Imbues the wielder with legendary martial prowress and a nigh-unquenchable thirst for glorious battle!"
+	var/datum/martial_art/highlander/style = new
+
+/obj/item/weapon/claymore/highlander/Destroy()
+	if(ishuman(loc))	//just in case it gets destroyed while in someone's possession, such as due to acid or something?
+		var/mob/living/carbon/human/H = loc
+		style.remove(H)
+	QDEL_NULL(style)
+	return ..()
+
+/obj/item/weapon/claymore/highlander/equipped(mob/user, slot)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	if(slot == slot_r_hand || slot == slot_l_hand)
+		if(H.martial_art && H.martial_art != style)
+			style.teach(H, 1)
+			to_chat(H, "<span class='notice'>THERE CAN ONLY BE ONE!</span>")
+	else if(H.martial_art && H.martial_art == style)
+		style.remove(H)
+		var/obj/item/weapon/claymore/highlander/sword = H.is_in_hands(/obj/item/weapon/claymore/highlander)
+		if(sword)
+			//if we have a highlander sword in the other hand, relearn the style from that sword.
+			sword.style.teach(H, 1)
+
+/obj/item/weapon/claymore/highlander/dropped(mob/user)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	style.remove(H)
+	var/obj/item/weapon/claymore/highlander/sword = H.is_in_hands(/obj/item/weapon/claymore/highlander)
+	if(sword)
+		//if we have a highlander sword in the other hand, relearn the style from that sword.
+		sword.style.teach(H, 1)

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

@@ -159,6 +159,11 @@
 		return 0
 	to_chat(imp_in, "<span class='notice'>Your dusting implant activates!</span>")
 	imp_in.visible_message("<span class = 'warning'>[imp_in] burns up in a flash!</span>")
+	for(var/obj/item/I in imp_in.contents)
+		if(I == src)
+			continue
+		if(I.flags & NODROP)
+			qdel(I)
 	imp_in.dust()
 
 /obj/item/weapon/implant/dust/emp_act(severity)

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

@@ -30,3 +30,11 @@
 				circuitry. As a result neurotoxins can cause massive damage.<HR>
 				Implant Specifics:<BR>"}
 	return dat
+
+/obj/item/weapon/implantcase/track
+	name = "implant case - 'Tracking'"
+	desc = "A glass case containing a tracking implant."
+
+/obj/item/weapon/implantcase/track/New()
+	imp = new /obj/item/weapon/implant/tracking(src)
+	..()

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

@@ -40,7 +40,7 @@
 	if(!istype(M))
 		return ..()
 
-	if(user.a_intent != I_HELP)
+	if(user.a_intent != INTENT_HELP)
 		if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
 			if((CLUMSY in user.mutations) && prob(50))
 				M = user

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

@@ -1183,9 +1183,9 @@
 
 /obj/item/weapon/book/manual/faxes
 	name = "A Guide to Faxes"
-	desc = "A NanoTrasen-approved guide to writing faxes"
+	desc = "A Nanotrasen-approved guide to writing faxes"
 	icon_state = "book6"
-	author = "NanoTrasen"
+	author = "Nanotrasen"
 	title = "A Guide to Faxes"
 	dat = {"
 
@@ -1213,14 +1213,14 @@
 				<li>Faxes are your main method of communicating with the NAS Trurl, better known as Central Command.</li>
 				<li>Faxes allow personnel on the station to maintain open lines of communication with the NAS Trurl, allowing for vital information to flow both ways.</li>
 				<li>Being written communications, proper grammar, syntax and typography is required, in addition to a signature and, if applicable, a stamp. Failure to sign faxes will lead to an automatic rejection.</li>
-				<li>We at NanoTrasen provide Fax Machines to every Head of Staff, in addition to the Magistrate, NanoTrasen Representative, and Internal Affairs Agents.</li>
+				<li>We at Nanotrasen provide Fax Machines to every Head of Staff, in addition to the Magistrate, Nanotrasen Representative, and Internal Affairs Agents.</li>
 				<li>This means that we trust the recipients of these fax machines to only use them in the proper circumstances (see <B>When to Fax?</B>).</li>
 
 				<h1><a name="when"><B>When to Fax?</B></a></h1><BR>
 				<li>While it is up to the discretion of each individual person to decide when to fax Central Command, there are some simple guidelines on when to do this.</li>
 				<li>Firstly, any situation that can reasonably be solved on-site, <I>should</I> be handled on-site. Knowledge of Standard Operating Procedure is <B>mandatory</B> for everyone with access to a fax machine.</li>
 				<li>Resolving issues on-site not only leads to more expedient problem-solving, it also frees up company resources and provides valuable work experience for all parties involved.</li>
-				<li>This means that you should work with the Heads of Staff concerning personnel and workplace issues, and attempt to resolve situations with them. If, for whatever reason, the relevent Head of Staff is not available or receptive, consider speaking with the Captain and/or NanoTrasen Representative.</li>
+				<li>This means that you should work with the Heads of Staff concerning personnel and workplace issues, and attempt to resolve situations with them. If, for whatever reason, the relevent Head of Staff is not available or receptive, consider speaking with the Captain and/or Nanotrasen Representative.</li>
 				<li>If, for whatever reason, these issues cannot be solved on-site, either due to incompetence or just plain refusal to cooperate, faxing Central Command becomes a viable option.</li>
 				<li>Secondly, station status reports should be sent occasionally, but never at the start of the shift. Remember, we assign personnel to the station. We do not need a repeat of what we just signed off on.</li>
 				<li>Thirdly, staff/departmental evaluations are always welcome, especially in cases of noticeable (in)competence. Just as a brilliant coworker can be rewarded, an incompetent one can be punished.</li>
@@ -2487,7 +2487,7 @@
 					<li><a href="#foreword">Foreword</a></li>
 					<li><a href="#cap">Captain</a></li>
 					<li><a href="#hop">Head of Personnel</a></li>
-					<li><a href="#ntrep">NanoTrasen Representative</a></li>
+					<li><a href="#ntrep">Nanotrasen Representative</a></li>
 					<li><a href="#bs">Blueshield Officer</a></li>
                     <li><a href="#ai">AI</a></li>
 				</ol>
@@ -2507,9 +2507,9 @@
 					<li>The Captain must keep the Nuclear Authentication Disk on their person at all times or, failing that, in the possession of the Head of Security or Blueshield;</li>
 					<li>The Captain is to attempt to resolve every issue that arises in Command locally before contacting Central Command;</li>
 					<li>The Captain is not permitted to carry their Antique Laser Gun or Space Armor unless there's an immediate emergency that requires attending to;</li>
-					<li>The Captain, despite being in charge of the Cyberiad, is not independent from NanoTrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
+					<li>The Captain, despite being in charge of the Cyberiad, is not independent from Nanotrasen. Any attempts to disregard general company policy are to be considered an instant condition for contract termination;</li>
 					<li>The Captain may only promote personnel to a Acting Head of Staff position if there is no assigned Head of Staff associated with the Department. Said Acting Head of Staff must be a member of the Department they are to lead. See below for more information on Chain of Command;</li>
-                    <li>The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, NanoTrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.</li>
+                    <li>The Captain may not fire any Head of Staff without reasonable justification (ie, incompetency, criminal activity, or otherwise any action that endangers/compromises the station and/or crew). The Captain may not fire any Central Command VIPs (ie, Blueshield, Magistrate, Nanotrasen Representative) without permission from Central Command, unless they are blatantly acting against the well-being and safety of the crew and station.</li>
 				</ol><BR>
 
                 <h1><a name="hop"><B>Head of Personnel</B></a></h1><BR>
@@ -2518,7 +2518,7 @@
 					<li>The Head of Personnel may not give any personnel increased access without authorization from the relevant Head of Staff. This includes the Head of Personnel. In addition, the Head of Personnel may only give Captain-Level access to someone if they are the Acting Captain. This access is to be removed when a proper Captain arrives on the station;</li>
 					<li>The Head of Personnel may not increase any Job Openings unless the relevant Head of Staff approves;</li>
 					<li>The Head of Personnel may not fire any personnel without authorization from the relevant Head of Staff, unless other conditions apply (see Space Law and General Standard Operating Procedure);</li>
-					<li>The Head of Personnel may not promote any personnel to the following Jobs without authorization from Central Command: Barber, Brig Physician, NanoTrasen Representative, Blueshield, Security Pod Pilot, Mechanic and Magistrate; (This is due to them being karma locked. Do not promote people to these positions without approval from the Administrators);</li>
+					<li>The Head of Personnel may not promote any personnel to the following Jobs without authorization from Central Command: Barber, Brig Physician, Nanotrasen Representative, Blueshield, Security Pod Pilot, Mechanic and Magistrate; (This is due to them being karma locked. Do not promote people to these positions without approval from the Administrators);</li>
 					<li>The Head of Personnel is free to utilize paperwork at their discretion. However, during major station emergencies, expediency should take precedence over bureaucracy;</li>
 					<li>The Head of Personnel may not leave their office unmanned if there are personnel waiting in line. Failure to respond to personnel with a legitimate request within ten (10) minutes, either via radio or in person, is to be considered a breach of Standard Operating Procedure;</li>
 					<li>Despite nominally being in charge of Supply, the Head of Personnel should allow the Quartermaster to run the Department, unless they prove themselves to be incompetent/dangerous;</li>
@@ -2526,13 +2526,13 @@
                     <li>The Head of Personnel is not permitted to perform Security duty. The Head of Personnel is permitted to carry an Energy Gun, for self-defence only.</li>
 				</ol><BR>
 
-				<h1><a name="ntrep"><B>NanoTrasen Representative</B></a></h1><BR>
+				<h1><a name="ntrep"><B>Nanotrasen Representative</B></a></h1><BR>
 				<ol>
-					<li>The NanoTrasen Representative is to ensure that every Department is following Standard Operating Procedure, up to and including the respective Head of Staff. If a Head of Staff is not available for a Department, the NanoTrasen Representative must ensure that the Captain appoints an Acting Head of Staff for said Department;</li>
-					<li>The NanoTrasen Representative must attempt to resolve any breach of Standard Operating Procedure locally before contacting Central Command. This is an imperative: Standard Operating Procedure should always be followed unless there is a very good reason not to;</li>
-					<li>The NanoTrasen Representative must, together with the Magistrate and Head of Security, ensure that Space Law is being followed and correctly applied;</li>
-					<li>The NanoTrasen Representative may not threaten the use of a fax in order to gain leverage over any personnel, up to and including Command. In addition they may not threaten to fire, or have Central Command, fire anyone, unless they actually possess a demotion note;</li>
-					<li>The NanoTrasen Representative is permitted to carry their Stun-Cane, or a Telescopic Baton if the Stun-Cane is lost.</li>
+					<li>The Nanotrasen Representative is to ensure that every Department is following Standard Operating Procedure, up to and including the respective Head of Staff. If a Head of Staff is not available for a Department, the Nanotrasen Representative must ensure that the Captain appoints an Acting Head of Staff for said Department;</li>
+					<li>The Nanotrasen Representative must attempt to resolve any breach of Standard Operating Procedure locally before contacting Central Command. This is an imperative: Standard Operating Procedure should always be followed unless there is a very good reason not to;</li>
+					<li>The Nanotrasen Representative must, together with the Magistrate and Head of Security, ensure that Space Law is being followed and correctly applied;</li>
+					<li>The Nanotrasen Representative may not threaten the use of a fax in order to gain leverage over any personnel, up to and including Command. In addition they may not threaten to fire, or have Central Command, fire anyone, unless they actually possess a demotion note;</li>
+					<li>The Nanotrasen Representative is permitted to carry their Stun-Cane, or a Telescopic Baton if the Stun-Cane is lost.</li>
 				</ol><BR>
 
                 <h1><a name="bs"><B>Blueshield Officer</B></a></h1><BR>
@@ -2547,14 +2547,14 @@
 				<b><i>The following are procedures for AI Maintenance:</i></b><br>
 				<ol>
 					<li>Only the Captain or Research Director may enter the AI Upload to perform Law Changes (see below), and only the Captain, Research Director or Chief Engineer may enter the AI Core to perform a Carding (see below);</li>
-					<li> No Law Changes are to be performed without approval from the Captain and Research Director. The only Lawsets to be used are those provided by NanoTrasen. Failure to legally perform a Law Change is to be considered Sabotage. Command must be informed prior to the Law Change, and all objections must be taken into consideration. If the number of Command personnel opposing the Law Change is greater than the number of Command personnel in favour, the Law Change is not to be done. If the Law Change is performed, the crew is to be immediately informed of the new Law(s);</li>
+					<li> No Law Changes are to be performed without approval from the Captain and Research Director. The only Lawsets to be used are those provided by Nanotrasen. Failure to legally perform a Law Change is to be considered Sabotage. Command must be informed prior to the Law Change, and all objections must be taken into consideration. If the number of Command personnel opposing the Law Change is greater than the number of Command personnel in favour, the Law Change is not to be done. If the Law Change is performed, the crew is to be immediately informed of the new Law(s);</li>
                     <li>The AI may not be Carded unless it it clearly malfunctioning or subverted. However, any member of Command may card it if the AI agrees to it, either at the end of the shift, or due to external circumstances (such as massive damage to the AI Satellite);</li>
                     <li>The AI Upload and Minisat Antechamber Turrets are to be kept on Non-Lethal in Code Green and Code Blue. The AI Core Turrets are to be kept on Lethal at all times. If a legal Law Change or Carding is occurring, the Turrets are to be disabled;</li>
                     <li>If the AI Unit is not malfunctioning or subverted, any attempt at performing an illegal Carding or Law Change is to be responded to with non-lethal force. If the illegal attempts persist, and the perpetrator is demonstrably hostile, lethal force from Command/Security is permitted;</li>
                     <li>Freeform Laws are only to be added if absolutely necessary due to external circumstances (such as major station emergencies). Adding unnecessary Freeform Laws is not permitted. Exception is made if the AI Unit and majority of Command agree to the Freeform Law that is proposed;</li>
-                    <li>Any use of the "Purge" Module is to be followed by the upload of a NanoTrasen-approved Lawset immediately. AI Units must be bound to a Lawset at all times.</li>
+                    <li>Any use of the "Purge" Module is to be followed by the upload of a Nanotrasen-approved Lawset immediately. AI Units must be bound to a Lawset at all times.</li>
 				</ol><BR>
 				</body>
 				</html>
 
-		"}
+		"}

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

@@ -20,7 +20,7 @@
 	toolspeed = 0.75
 
 /obj/item/weapon/scissors/attack(mob/living/carbon/M as mob, mob/user as mob)
-	if(user.a_intent != "help")
+	if(user.a_intent != INTENT_HELP)
 		..()
 		return
 	if(!(M in view(1))) //Adjacency test
@@ -95,13 +95,12 @@
 		user.visible_message("<span class='notice'>[user] finishes cutting [M]'s hair!</span>")
 
 /obj/item/weapon/scissors/safety //Totally safe, I assure you.
-	name = "safety scissors"
 	desc = "The blades of the scissors appear to be made of some sort of ultra-strong metal alloy."
 	force = 18 //same as e-daggers
 	var/is_cutting = 0 //to prevent spam clicking this for huge accumulation of losebreath.
 
 /obj/item/weapon/scissors/safety/attack(mob/living/carbon/M as mob, mob/user as mob)
-	if(user.a_intent != "help")
+	if(user.a_intent != INTENT_HELP)
 		..()
 		return
 	if(!(M in view(1)))

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

@@ -317,7 +317,7 @@
 
 /obj/item/weapon/storage/fancy/rollingpapers
 	name = "rolling paper pack"
-	desc = "A pack of NanoTrasen brand rolling papers."
+	desc = "A pack of Nanotrasen brand rolling papers."
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"

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

@@ -478,7 +478,7 @@
 /obj/item/weapon/storage/attack_self(mob/user as mob)
 
 	//Clicking on itself will empty it, if it has the verb to do that.
-	if(user.get_active_hand() == src)
+	if(user.is_in_active_hand(src))
 		if(src.verbs.Find(/obj/item/weapon/storage/verb/quick_empty))
 			src.quick_empty()
 			return

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

@@ -216,3 +216,13 @@
 		B.deity_name = "Success"
 		B.icon_state = "greentext"
 		B.item_state = "greentext"
+
+
+/obj/item/weapon/storage/box/syndie_kit/cutouts
+	name = "Fortified Artistic Box"
+
+/obj/item/weapon/storage/box/syndie_kit/cutouts/New()
+	..()
+	for(var/i in 1 to 3)
+		new/obj/item/cardboard_cutout/adaptive(src)
+	new/obj/item/toy/crayon/spraycan(src)

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

@@ -118,7 +118,7 @@
 
 	var/mob/living/L = M
 
-	if(user.a_intent != I_HARM)
+	if(user.a_intent != INTENT_HARM)
 		if(status)
 			user.do_attack_animation(L)
 			baton_stun(L, user)

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

@@ -46,7 +46,7 @@
 			return
 		if(!isliving(target))
 			return
-		if(user.a_intent == I_HARM)
+		if(user.a_intent == INTENT_HARM)
 			if(!..()) return
 			if(!isrobot(target)) return
 		else

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

@@ -46,6 +46,18 @@
 		/obj/item/stack/sheet/wood,
 		/obj/item/stack/sheet/wood)
 
+/obj/item/weapon/table_parts/wood/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/stack/tile/carpet))
+		var/target = /obj/item/weapon/table_parts/fancy
+		if(istype(W, /obj/item/stack/tile/carpet/black))
+			target = /obj/item/weapon/table_parts/fancy/black
+		var/obj/item/stack/S = W
+		if(S.use(1))
+			new target(get_turf(src))
+			qdel(src)
+	else
+		. = ..()
+
 /obj/item/weapon/table_parts/glass
 	name = "glass table parts"
 	desc = "fragile!"
@@ -57,6 +69,17 @@
 		/obj/item/stack/sheet/metal,
 		/obj/item/stack/sheet/metal)
 
+/obj/item/weapon/table_parts/fancy
+	name = "fancy table parts"
+	desc = "Pretty!"
+	icon_state = "fancy_tableparts"
+	result = /obj/structure/table/wood/fancy
+
+/obj/item/weapon/table_parts/fancy/black
+	name = "black fancy table parts"
+	icon_state = "black_fancy_tableparts"
+	result = /obj/structure/table/wood/fancy/black
+
 /obj/item/weapon/rack_parts
 	name = "rack parts"
 	desc = "Parts of a rack."

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

@@ -128,7 +128,7 @@ Frequency:
 	if(turfs.len)
 		L["None (Dangerous)"] = pick(turfs)
 	var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") as null|anything in L
-	if(!t1 || (user.get_active_hand() != src || user.stat || user.restrained()))
+	if(!t1 || (user.is_in_active_hand(src) || user.stat || user.restrained()))
 		return
 	if(active_portals >= 3)
 		user.show_message("<span class='notice'>\The [src] is recharging!</span>")

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

@@ -155,7 +155,7 @@
 		src.pixel_y = rand(0, 16)
 
 /obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
-	if(!istype(M) || user.a_intent == I_HELP)
+	if(!istype(M) || user.a_intent == INTENT_HELP)
 		return ..()
 	if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
 		return ..()
@@ -241,8 +241,7 @@
 /obj/item/weapon/wirecutters/attack(mob/living/carbon/C, mob/user)
 	if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
 		user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
-		qdel(C.handcuffed)
-		C.handcuffed = null
+		QDEL_NULL(C.handcuffed)
 		if(C.buckled && C.buckled.buckle_requires_restraints)
 			C.buckled.unbuckle_mob(C)
 		C.update_handcuffed()
@@ -404,7 +403,7 @@
 		if(!S)
 			return
 
-		if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2)
+		if(!(S.status & ORGAN_ROBOT) || user.a_intent != INTENT_HELP || S.open == 2)
 			return ..()
 
 		if(!isOn())		//why wasn't this being checked already?

code/game/objects/structures/artstuff.dm

@@ -1,10 +1,3 @@
-/////////////////
-// NEW DEFINES //
-/////////////////
-
-/client
-	var/viewingCanvas = 0 //If this is 1, as soon as client /TRIES/ to move the view resets.
-
 ///////////
 // EASEL //
 ///////////
@@ -140,20 +133,4 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 		icon = blank
 		user.visible_message("<span class='notice'>[user] cleans the canvas.</span>","<span class='notice'>You clean the canvas.</span>")
 
-//Examine to enlarge
-/obj/item/weapon/canvas/examine(mob/user)
-	..(user)
-	if(in_range(user, src) && get_turf(src) && user.client && ishuman(user)) //Let only humans be the robust zoominators. I'm too spooked other mobs trying to use it may get broken huds.
-		if(src.loc == user || get_turf(src) == get_turf(user))
-			to_chat(user, "<span class='notice'>[src] has to be on the ground to focus on it!</span>")
-			return
-		to_chat(user, "<span class='notice'>You focus on \the [src].</span>")
-		user.client.screen = list() //This is because screen objects go way past the view bounds we set, therefore not allowing stretch to fit to zoom in properly.
-		user.client.reset_stretch = winget(user.client, "mapwindow.map", "icon-size") //Remember previous icon-size
-		user.client.view = 3 //Decrease view
-		winset(user.client, "mapwindow.map", "icon-size=0") //Enable stretch-to-fit
-		user.client.viewingCanvas = 1 //Reset everything we just changed as soon as client tries to move
-	else
-		to_chat(user, "<span class='notice'>It is too far away.</span>")
-
 #undef AMT_OF_CANVASES

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

@@ -193,6 +193,9 @@
 							L[tmpname] = R
 					var/desc = input("Please select a telepad.", "RCS") in L
 					E.pad = L[desc]
+					if(!Adjacent(user))
+						to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
+						return
 					playsound(E.loc, E.usesound, 50, 1)
 					to_chat(user, "<span class='notice'>Teleporting [name]...</span>")
 					E.teleporting = 1
@@ -204,17 +207,22 @@
 						to_chat(user, "<span class='warning'>Error: User located in container--aborting for safety.</span>")
 						playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
 						return
+					if(!(E.rcell && E.rcell.use(E.chargecost)))
+						to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
+						return
 					var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
 					do_teleport(src, E.pad, 0)
-					E.rcell.use(E.chargecost)
 					to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
 					return
 			else
 				E.rand_x = rand(50,200)
 				E.rand_y = rand(50,200)
 				var/L = locate(E.rand_x, E.rand_y, 6)
+				if(!Adjacent(user))
+					to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
+					return
 				playsound(E.loc, E.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>Teleporting [name]...</span>")
 				E.teleporting = 1
@@ -226,11 +234,13 @@
 					to_chat(user, "<span class='warning'>Error: User located in container--aborting for safety.</span>")
 					playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
 					return
+				if(!(E.rcell && E.rcell.use(E.chargecost)))
+					to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
+					return
 				var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 				s.set_up(5, 1, src)
 				s.start()
 				do_teleport(src, L)
-				E.rcell.use(E.chargecost)
 				to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
 				return
 		else

code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm

@@ -15,6 +15,9 @@
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/suit/hooded/nun(src)
 	new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
+	new /obj/item/clothing/suit/hooded/monk(src)
+	new /obj/item/clothing/suit/witchhunter(src)
+	new /obj/item/clothing/head/witchhunter_hat(src)
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/under/wedding/bride_white(src)
 	new /obj/item/weapon/storage/backpack/cultpack (src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -327,7 +327,7 @@
 		new /obj/item/clothing/suit/storage/det_suit(src)
 		new /obj/item/clothing/suit/storage/det_suit/forensics/blue(src)
 		new /obj/item/clothing/suit/storage/det_suit/forensics/red(src)
-		new /obj/item/clothing/gloves/color/black(src)
+		new /obj/item/clothing/gloves/color/black/forensics(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/storage/box/evidence(src)

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

@@ -102,6 +102,9 @@
 							L[tmpname] = R
 					var/desc = input("Please select a telepad.", "RCS") in L
 					E.pad = L[desc]
+					if(!Adjacent(user))
+						to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
+						return
 					playsound(E.loc, E.usesound, 50, 1)
 					to_chat(user, "<span class='notice'>Teleporting [src.name]...</span>")
 					E.teleporting = 1
@@ -109,17 +112,23 @@
 						E.teleporting = 0
 						return
 					E.teleporting = 0
+					if(!(E.rcell && E.rcell.use(E.chargecost)))
+						to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
+						return
 					var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
 					do_teleport(src, E.pad, 0)
-					E.rcell.use(E.chargecost)
 					to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
 					return
+
 			else
 				E.rand_x = rand(50,200)
 				E.rand_y = rand(50,200)
 				var/L = locate(E.rand_x, E.rand_y, 6)
+				if(!Adjacent(user))
+					to_chat(user, "<span class='notice'>Unable to teleport, too far from crate.</span>")
+					return
 				playsound(E.loc, E.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>Teleporting [src.name]...</span>")
 				E.teleporting = 1
@@ -127,11 +136,13 @@
 					E.teleporting = 0
 					return
 				E.teleporting = 0
+				if(!(E.rcell && E.rcell.use(E.chargecost)))
+					to_chat(user, "<span class='notice'>Unable to teleport, insufficient charge.</span>")
+					return
 				var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 				s.set_up(5, 1, src)
 				s.start()
 				do_teleport(src, L)
-				E.rcell.use(E.chargecost)
 				to_chat(user, "<span class='notice'>Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.</span>")
 				return
 		else

code/game/objects/structures/curtains.dm

@@ -35,6 +35,44 @@
 		icon_state = "open"
 		layer = SHOWER_OPEN_LAYER
 
+/obj/structure/curtain/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/toy/crayon))
+		color = input(user, "Choose Color") as color
+	else if(isscrewdriver(W))
+		if(anchored)
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] unscrews [src] from the floor.</span>", "<span class='notice'>You start to unscrew [src] from the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 50 * W.toolspeed, target = src))
+				if(!anchored)
+					return
+				anchored = FALSE
+				to_chat(user, "<span class='notice'>You unscrew [src] from the floor.</span>")
+		else
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] screws [src] to the floor.</span>", "<span class='notice'>You start to screw [src] to the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 50 * W.toolspeed, target = src))
+				if(anchored)
+					return
+				anchored = TRUE
+				to_chat(user, "<span class='notice'>You screw [src] to the floor.</span>")
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		if(!anchored)
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] cuts apart [src].</span>", "<span class='notice'>You start to cut apart [src].</span>", "You hear cutting.")
+			if(do_after(user, 50 * W.toolspeed, target = src))
+				if(anchored)
+					return
+				to_chat(user, "<span class='notice'>You cut apart [src].</span>")
+				deconstruct()
+	else
+		. = ..()
+
+/obj/structure/curtain/proc/deconstruct(disassembled = TRUE)
+	new /obj/item/stack/sheet/cloth(loc, 2)
+	new /obj/item/stack/sheet/plastic(loc, 2)
+	new /obj/item/stack/rods(loc, 1)
+	qdel(src)
+
 /obj/structure/curtain/black
 	name = "black curtain"
 	color = "#222222"
@@ -59,4 +97,4 @@
 	color = "#000066"
 
 #undef SHOWER_OPEN_LAYER
-#undef SHOWER_CLOSED_LAYER
+#undef SHOWER_CLOSED_LAYER

code/game/objects/structures/displaycase.dm

@@ -105,19 +105,21 @@ var/global/list/captain_display_cases = list()
 	var/ue = null
 	var/image/occupant_overlay = null
 	var/obj/item/weapon/airlock_electronics/circuit
+	var/start_showpiece_type = null //add type for items on display
+
+/obj/structure/displaycase/New()
+	. = ..()
+	if(start_showpiece_type)
+		occupant = new start_showpiece_type(src)
+	update_icon()
 
 /obj/structure/displaycase/captains_laser
 	name = "captain's display case"
 	desc = "A display case for the captain's antique laser gun. Hooked up with an anti-theft system."
-	burglar_alarm = 1
-
-/obj/structure/displaycase/captains_laser/New()
-	captain_display_cases += src
-	req_access = list(access_captain)
+	burglar_alarm = 1
 	locked = 1
-	spawn(5)
-		occupant = new /obj/item/weapon/gun/energy/laser/captain(src)
-		update_icon()
+	req_access = list(access_captain)
+	start_showpiece_type = /obj/item/weapon/gun/energy/laser/captain
 
 /obj/structure/displaycase/Destroy()
 	dump()
@@ -259,7 +261,7 @@ var/global/list/captain_display_cases = list()
 	if(W.flags & ABSTRACT)
 		to_chat(user, "<span class='danger'>You can't put this into the case.</span>")
 		return
-	if(user.a_intent == I_HARM)
+	if(user.a_intent == INTENT_HARM)
 		if(locked && !destroyed)
 			src.health -= W.force
 			src.healthcheck()
@@ -283,14 +285,14 @@ var/global/list/captain_display_cases = list()
 			update_icon()
 
 /obj/structure/displaycase/attack_hand(mob/user as mob)
-	if(destroyed || (!locked && user.a_intent == I_HARM))
+	if(destroyed || (!locked && user.a_intent == INTENT_HARM))
 		if(occupant)
 			dump()
 			to_chat(user, "<span class='danger'>You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field.</span>")
 			src.add_fingerprint(user)
 			update_icon()
 	else
-		if(user.a_intent == I_HARM)
+		if(user.a_intent == INTENT_HARM)
 			user.changeNext_move(CLICK_CD_MELEE)
 			user.do_attack_animation(src)
 			user.visible_message("<span class='danger'>[user.name] kicks \the [src]!</span>", \
@@ -317,8 +319,9 @@ var/global/list/captain_display_cases = list()
 				else
 					to_chat(src, "[bicon(src)] <span class='warning'>\The [src] is empty!</span>")
 		else
-			user.visible_message("[user.name] gently runs his hands over \the [src] in appreciation of its contents.", \
-				"You gently run your hands over \the [src] in appreciation of its contents.", \
+			user.changeNext_move(CLICK_CD_MELEE)
+			user.visible_message("[user.name] gently runs \his hands over [src] in appreciation of its contents.", \
+				"You gently run your hands over [src] in appreciation of its contents.", \
 				"You hear someone streaking glass with their greasy hands.")
 
 #undef DISPLAYCASE_FRAME_CIRCUIT

code/game/objects/structures/mineral_doors.dm

@@ -136,7 +136,7 @@
 		if(do_after(user, digTool.digspeed * hardness, target = src) && src)
 			to_chat(user, "<span class='notice'>You finished digging.</span>")
 			deconstruct(TRUE)
-	else if(user.a_intent != I_HARM)
+	else if(user.a_intent != INTENT_HARM)
 		attack_hand(user)
 	else
 		attacked_by(W, user)

code/game/objects/structures/morgue.dm

@@ -102,8 +102,7 @@
 			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, open_sound, 50, 1)
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	else
 		playsound(loc, open_sound, 50, 1)
 		connected = new /obj/structure/m_tray( loc )
@@ -118,8 +117,7 @@
 			connected.icon_state = "morguet"
 			connected.dir = dir
 		else
-			qdel(connected)
-			connected = null
+			QDEL_NULL(connected)
 	add_fingerprint(user)
 	update()
 	return
@@ -155,8 +153,7 @@
 			A.forceMove(connected.loc)
 		connected.icon_state = "morguet"
 	else
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	return
 
 /obj/structure/morgue/Destroy()
@@ -306,8 +303,7 @@
 			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, open_sound, 50, 1)
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	else if(locked == 0)
 		playsound(loc, open_sound, 50, 1)
 		connected = new /obj/structure/c_tray( loc )
@@ -321,8 +317,7 @@
 				A.forceMove(connected.loc)
 			connected.icon_state = "cremat"
 		else
-			qdel(connected)
-			connected = null
+			QDEL_NULL(connected)
 	add_fingerprint(user)
 	update()
 
@@ -355,8 +350,7 @@
 			A.forceMove(connected.loc)
 		connected.icon_state = "cremat"
 	else
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	return
 
 /obj/structure/crematorium/proc/cremate(mob/user as mob)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -17,6 +17,7 @@
 	burntime = 30
 	buildstackamount = 2
 	var/movable = 0 // For mobility checks
+	buckle_offset = -6
 
 /obj/structure/stool/bed/MouseDrop(atom/over_object)
 	..(over_object, skip_fucking_stool_shit = 1)
@@ -36,6 +37,7 @@
 	anchored = 0
 	buildstackamount = 10
 	buildstacktype = /obj/item/stack/sheet/wood
+	buckle_offset = 0
 
 /obj/structure/stool/bed/dogbed/ian
 	name = "Ian's bed"
@@ -139,5 +141,4 @@
 	to_chat(user, "<span class='notice'>You deploy the roller bed.</span>")
 	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
 	R.add_fingerprint(user)
-	qdel(held)
-	held = null
+	QDEL_NULL(held)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -5,7 +5,7 @@
 	buckle_lying = 0 //you sit in a chair, not lay
 	burn_state = FIRE_PROOF
 	buildstackamount = 1
-
+	buckle_offset = 0
 	var/propelled = 0 // Check for fire-extinguisher-driven chairs
 
 /obj/structure/stool/bed/chair/New()

code/game/objects/structures/tables_racks.dm

@@ -412,6 +412,35 @@
 /obj/structure/table/woodentable/poker/narsie_act()
 	return
 
+/*
+ * Fancy Tables
+ */
+
+/obj/structure/table/wood/fancy
+	name = "fancy table"
+	desc = "A standard metal table frame covered with an amazingly fancy, patterned cloth."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "fancy_table"
+	parts = /obj/item/weapon/table_parts/fancy
+	canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black)
+
+/obj/structure/table/wood/fancy/New()
+	icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor
+	..()
+
+/obj/structure/table/wood/fancy/black
+	icon_state = "fancy_table_black"
+	parts = /obj/item/weapon/table_parts/fancy/black
+
+/obj/structure/table/wood/fancy/black/New()
+	..()
+	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' //so that the tables place correctly in the map editor
+
+
+/*
+ * Glass Tables
+ */
+
 /obj/structure/glasstable_frame
 	name = "glass table frame"
 	desc = "A metal frame for a glass table."

code/game/objects/structures/watercloset.dm

@@ -120,6 +120,15 @@
 		to_chat(user, "<span class='notice'>You carefully place [I] into the cistern.</span>")
 		return
 
+/obj/structure/toilet/secret
+	var/secret_type = null
+
+/obj/structure/toilet/secret/New()
+	. = ..()
+	if(secret_type)
+		var/obj/item/secret = new secret_type(src)
+		secret.desc += " It's a secret!"
+		w_items += secret.w_class
 
 
 /obj/structure/urinal

code/game/objects/structures/windoor_assembly.dm

@@ -247,6 +247,9 @@ obj/structure/windoor_assembly/Destroy()
 				if(do_after(user, 40 * W.toolspeed, target = src))
 
 					if(src.loc && src.electronics)
+						for(var/obj/machinery/door/window/WD in loc)
+							if(WD.dir == dir)
+								return
 
 						density = 1 //Shouldn't matter but just incase
 						to_chat(user, "<span class='notice'>You finish the windoor!</span>")

code/game/objects/structures/window.dm

@@ -133,7 +133,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
 		destroy()
-	else if(user.a_intent == I_HARM)
+	else if(user.a_intent == INTENT_HARM)
 		user.changeNext_move(CLICK_CD_MELEE)
 		playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
 		user.visible_message("<span class='warning'>[user.name] bangs against the [src.name]!</span>", \

code/game/sound.dm

@@ -15,6 +15,7 @@ var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effect
 var/list/terminal_type = list('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg',
 							  'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg',
 							  'sound/machines/terminal_button07.ogg', 'sound/machines/terminal_button08.ogg')
+var/list/growls = list('sound/goonstation/voice/growl1.ogg', 'sound/goonstation/voice/growl2.ogg', 'sound/goonstation/voice/growl3.ogg')
 
 /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/pitch)
 
@@ -142,4 +143,6 @@ var/list/terminal_type = list('sound/machines/terminal_button01.ogg', 'sound/mac
 				soundin = pick(ricochet)
 			if("terminal_type")
 				soundin = pick(terminal_type)
+			if("growls")
+				soundin = pick(growls)
 	return soundin

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

@@ -145,6 +145,11 @@
 	burnt = 1
 	update_icon()
 
+/turf/simulated/floor/carpet/black
+	icon = 'icons/turf/floors/carpet_black.dmi'
+	floor_tile = /obj/item/stack/tile/carpet/black
+	canSmoothWith = list(/turf/simulated/floor/carpet/black)
+
 /turf/simulated/floor/fakespace
 	icon = 'icons/turf/space.dmi'
 	icon_state = "0"
@@ -153,4 +158,4 @@
 
 /turf/simulated/floor/fakespace/New()
 	..()
-	icon_state = "[rand(0,25)]"
+	icon_state = "[rand(0,25)]"