fixes merge conflict

code/game/dna/genes/goon_disabilities.dm

@@ -135,13 +135,13 @@
 	message = replacetextEx(message,"w","v")
 	message = replacetextEx(message,"J","Y")
 	message = replacetextEx(message,"j","y")
-	message = replacetextEx(message,"A",pick("Å","Ä","Æ","A"))
-	message = replacetextEx(message,"a",pick("å","ä","æ","a"))
+	message = replacetextEx(message,"A",pick("Å","Ä","Æ","A"))
+	message = replacetextEx(message,"a",pick("å","ä","æ","a"))
 	message = replacetextEx(message,"BO","BJO")
 	message = replacetextEx(message,"Bo","Bjo")
 	message = replacetextEx(message,"bo","bjo")
-	message = replacetextEx(message,"O",pick("Ö","Ø","O"))
-	message = replacetextEx(message,"o",pick("ö","ø","o"))
+	message = replacetextEx(message,"O",pick("Ö","Ø","O"))
+	message = replacetextEx(message,"o",pick("ö","ø","o"))
 	if(prob(30))
 		message += " Bork[pick("",", bork",", bork, bork")]!"
 	return message
@@ -259,7 +259,7 @@
 
 	action_icon_state = "genetic_incendiary"
 
-/obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets,mob/living/user = usr)
+/obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets, mob/living/user = usr)
 	var/mob/living/carbon/L = user
 	L.adjust_fire_stacks(0.5)
 	L.visible_message("<span class='danger'>[L.name]</b> suddenly bursts into flames!</span>")

code/game/dna/genes/goon_powers.dm

@@ -143,15 +143,15 @@
 
 	action_icon_state = "genetic_cryo"
 
-/obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets)
+/obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets, mob/user = usr)
 	if(!targets.len)
-		to_chat(usr, "<span class='notice'>No target found in range.</span>")
+		to_chat(user, "<span class='notice'>No target found in range.</span>")
 		return
 
 	var/mob/living/carbon/C = targets[1]
 
 	if(!iscarbon(C))
-		to_chat(usr, "<span class='warning'>This will only work on normal organic beings.</span>")
+		to_chat(user, "<span class='warning'>This will only work on normal organic beings.</span>")
 		return
 
 	if(RESIST_COLD in C.mutations)
@@ -164,15 +164,15 @@
 			if(istype(H.wear_suit, /obj/item/clothing/suit/space))
 				handle_suit = 1
 				if(H.internal)
-					H.visible_message("<span class='warning'>[usr] sprays a cloud of fine ice crystals, engulfing [H]!</span>",
-										"<span class='notice'>[usr] sprays a cloud of fine ice crystals over your [H.head]'s visor.</span>")
-					log_admin("[key_name(usr)] has used cryokinesis on [key_name(C)] while wearing internals and a suit")
-					msg_admin_attack("[key_name_admin(usr)] has cast cryokinesis on [key_name_admin(C)]")
+					H.visible_message("<span class='warning'>[user] sprays a cloud of fine ice crystals, engulfing [H]!</span>",
+										"<span class='notice'>[user] sprays a cloud of fine ice crystals over your [H.head]'s visor.</span>")
+					log_admin("[key_name(user)] has used cryokinesis on [key_name(C)] while wearing internals and a suit")
+					msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]")
 				else
-					H.visible_message("<span class='warning'>[usr] sprays a cloud of fine ice crystals engulfing, [H]!</span>",
-										"<span class='warning'>[usr] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.</span>")
-					log_admin("[key_name(usr)] has used cryokinesis on [key_name(C)]")
-					msg_admin_attack("[key_name_admin(usr)] has cast cryokinesis on [key_name_admin(C)]")
+					H.visible_message("<span class='warning'>[user] sprays a cloud of fine ice crystals engulfing, [H]!</span>",
+										"<span class='warning'>[user] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.</span>")
+					log_admin("[key_name(user)] has used cryokinesis on [key_name(C)]")
+					msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]")
 					H.bodytemperature = max(0, H.bodytemperature - 50)
 					H.adjustFireLoss(5)
 	if(!handle_suit)
@@ -180,11 +180,11 @@
 		C.adjustFireLoss(10)
 		C.ExtinguishMob()
 
-		C.visible_message("\red [usr] sprays a cloud of fine ice crystals, engulfing [C]!")
-		log_admin("[key_name(usr)] has used cryokinesis on [key_name(C)] without internals or a suit")
-		msg_admin_attack("[key_name_admin(usr)] has cast cryokinesis on [key_name_admin(C)]")
+		C.visible_message("\red [user] sprays a cloud of fine ice crystals, engulfing [C]!")
+		log_admin("[key_name(user)] has used cryokinesis on [key_name(C)] without internals or a suit")
+		msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]")
 
-	//playsound(usr.loc, 'bamf.ogg', 50, 0)
+	//playsound(user.loc, 'bamf.ogg', 50, 0)
 
 	new/obj/effect/self_deleting(C.loc, icon('icons/effects/genetics.dmi', "cryokinesis"))
 
@@ -294,10 +294,9 @@
 		revert_cast(user)
 		return
 
-	perform(targets)
+	perform(targets, user = user)
 
-/obj/effect/proc_holder/spell/targeted/eat/cast(list/targets)
-	var/mob/user = usr
+/obj/effect/proc_holder/spell/targeted/eat/cast(list/targets, mob/user = usr)
 	if(!targets.len)
 		to_chat(user, "<span class='notice'>No target found in range.</span>")
 		return
@@ -383,60 +382,60 @@
 
 	action_icon_state = "genetic_jump"
 
-/obj/effect/proc_holder/spell/targeted/leap/cast(list/targets)
+/obj/effect/proc_holder/spell/targeted/leap/cast(list/targets, mob/user = usr)
 	var/failure = 0
-	if(istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat)
-		to_chat(usr, "<span class='warning'>You can't jump right now!</span>")
+	if(istype(user.loc,/mob/) || user.lying || user.stunned || user.buckled || user.stat)
+		to_chat(user, "<span class='warning'>You can't jump right now!</span>")
 		return
 
-	if(istype(usr.loc,/turf/))
-		if(usr.restrained())//Why being pulled while cuffed prevents you from moving
-			for(var/mob/M in range(usr, 1))
-				if(M.pulling == usr)
-					if(!M.restrained() && M.stat == 0 && M.canmove && usr.Adjacent(M))
+	if(istype(user.loc,/turf/))
+		if(user.restrained())//Why being pulled while cuffed prevents you from moving
+			for(var/mob/M in range(user, 1))
+				if(M.pulling == user)
+					if(!M.restrained() && M.stat == 0 && M.canmove && user.Adjacent(M))
 						failure = 1
 					else
 						M.stop_pulling()
 
-		if(usr.pinned.len)
+		if(user.pinned.len)
 			failure = 1
 
-		usr.visible_message("<span class='danger'>[usr.name]</b> takes a huge leap!</span>")
-		playsound(usr.loc, 'sound/weapons/thudswoosh.ogg', 50, 1)
+		user.visible_message("<span class='danger'>[user.name]</b> takes a huge leap!</span>")
+		playsound(user.loc, 'sound/weapons/thudswoosh.ogg', 50, 1)
 		if(failure)
-			usr.Weaken(5)
-			usr.Stun(5)
-			usr.visible_message("<span class='warning'>[usr] attempts to leap away but is slammed back down to the ground!</span>",
+			user.Weaken(5)
+			user.Stun(5)
+			user.visible_message("<span class='warning'>[user] attempts to leap away but is slammed back down to the ground!</span>",
 								"<span class='warning'>You attempt to leap away but are suddenly slammed back down to the ground!</span>",
 								"<span class='notice'>You hear the flexing of powerful muscles and suddenly a crash as a body hits the floor.</span>")
 			return 0
-		var/prevLayer = usr.layer
-		var/prevFlying = usr.flying
-		usr.layer = 9
+		var/prevLayer = user.layer
+		var/prevFlying = user.flying
+		user.layer = 9
 
-		usr.flying = 1
+		user.flying = 1
 		for(var/i=0, i<10, i++)
-			step(usr, usr.dir)
-			if(i < 5) usr.pixel_y += 8
-			else usr.pixel_y -= 8
+			step(user, user.dir)
+			if(i < 5) user.pixel_y += 8
+			else user.pixel_y -= 8
 			sleep(1)
-		usr.flying = prevFlying
+		user.flying = prevFlying
 
-		if(FAT in usr.mutations && prob(66))
-			usr.visible_message("<span class='danger'>[usr.name]</b> crashes due to their heavy weight!</span>")
-			//playsound(usr.loc, 'zhit.wav', 50, 1)
-			usr.AdjustWeakened(10)
-			usr.AdjustStunned(5)
+		if(FAT in user.mutations && prob(66))
+			user.visible_message("<span class='danger'>[user.name]</b> crashes due to their heavy weight!</span>")
+			//playsound(user.loc, 'zhit.wav', 50, 1)
+			user.AdjustWeakened(10)
+			user.AdjustStunned(5)
 
-		usr.layer = prevLayer
+		user.layer = prevLayer
 
-	if(istype(usr.loc,/obj/))
-		var/obj/container = usr.loc
-		to_chat(usr, "<span class='warning'>You leap and slam your head against the inside of [container]! Ouch!</span>")
-		usr.AdjustParalysis(3)
-		usr.AdjustWeakened(5)
-		container.visible_message("<span class='danger'>[usr.loc]</b> emits a loud thump and rattles a bit.</span>")
-		playsound(usr.loc, 'sound/effects/bang.ogg', 50, 1)
+	if(istype(user.loc,/obj/))
+		var/obj/container = user.loc
+		to_chat(user, "<span class='warning'>You leap and slam your head against the inside of [container]! Ouch!</span>")
+		user.AdjustParalysis(3)
+		user.AdjustWeakened(5)
+		container.visible_message("<span class='danger'>[user.loc]</b> emits a loud thump and rattles a bit.</span>")
+		playsound(user.loc, 'sound/effects/bang.ogg', 50, 1)
 		var/wiggle = 6
 		while(wiggle > 0)
 			wiggle--
@@ -446,9 +445,6 @@
 		container.pixel_x = 0
 		container.pixel_y = 0
 
-
-	return
-
 ////////////////////////////////////////////////////////////////////////
 
 // WAS: /datum/bioEffect/polymorphism
@@ -475,6 +471,7 @@
 	charge_max = 1800
 
 	clothes_req = 0
+	human_req = 1
 	stat_allowed = 0
 	invocation_type = "none"
 	range = 1
@@ -482,21 +479,18 @@
 
 	action_icon_state = "genetic_poly"
 
-/obj/effect/proc_holder/spell/targeted/polymorph/cast(list/targets)
-	var/mob/living/M=targets[1]
+/obj/effect/proc_holder/spell/targeted/polymorph/cast(list/targets, mob/user = usr)
+	var/mob/living/M = targets[1]
 	if(!ishuman(M))
 		to_chat(usr, "<span class='warning'>You can only change your appearance to that of another human.</span>")
 		return
 
-	if(!ishuman(usr))
-		return
-
-	usr.visible_message("<span class='warning'>[usr]'s body shifts and contorts.</span>")
+	user.visible_message("<span class='warning'>[user]'s body shifts and contorts.</span>")
 
 	spawn(10)
-		if(M && usr)
-			playsound(usr.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
-			var/mob/living/carbon/human/H = usr
+		if(M && user)
+			playsound(user.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
+			var/mob/living/carbon/human/H = user
 			var/mob/living/carbon/human/target = M
 			H.UpdateAppearance(target.dna.UI)
 			H.real_name = target.real_name
@@ -524,6 +518,7 @@
 	desc = "Read the minds of others for information."
 	charge_max = 180
 	clothes_req = 0
+	human_req = 1
 	stat_allowed = 0
 	invocation_type = "none"
 	range = -2
@@ -539,29 +534,26 @@
 		revert_cast(user)
 		return
 
-	perform(targets)
-
-/obj/effect/proc_holder/spell/targeted/empath/cast(list/targets)
-	if(!ishuman(usr))	return
-
+	perform(targets, user = user)
 
+/obj/effect/proc_holder/spell/targeted/empath/cast(list/targets, mob/user = usr)
 	for(var/mob/living/carbon/M in targets)
 		if(!iscarbon(M))
-			to_chat(usr, "<span class='warning'>You may only use this on other organic beings.</span>")
+			to_chat(user, "<span class='warning'>You may only use this on other organic beings.</span>")
 			return
 
 		if(PSY_RESIST in M.mutations)
-			to_chat(usr, "<span class='warning'>You can't see into [M.name]'s mind at all!</span>")
+			to_chat(user, "<span class='warning'>You can't see into [M.name]'s mind at all!</span>")
 			return
 
 		if(M.stat == 2)
-			to_chat(usr, "<span class='warning'>[M.name] is dead and cannot have their mind read.</span>")
+			to_chat(user, "<span class='warning'>[M.name] is dead and cannot have their mind read.</span>")
 			return
 		if(M.health < 0)
-			to_chat(usr, "<span class='warning'>[M.name] is dying, and their thoughts are too scrambled to read.</span>")
+			to_chat(user, "<span class='warning'>[M.name] is dying, and their thoughts are too scrambled to read.</span>")
 			return
 
-		to_chat(usr, "<span class='notice'>Mind Reading of <b>[M.name]:</b></span>")
+		to_chat(user, "<span class='notice'>Mind Reading of <b>[M.name]:</b></span>")
 		var/pain_condition = M.health
 		// lower health means more pain
 		var/list/randomthoughts = list("what to have for lunch","the future","the past","money",
@@ -578,33 +570,33 @@
 
 		switch(pain_condition)
 			if(81 to INFINITY)
-				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] feels good.</span>")
+				to_chat(user, "<span class='notice'><b>Condition</b>: [M.name] feels good.</span>")
 			if(61 to 80)
-				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering mild pain.</span>")
+				to_chat(user, "<span class='notice'><b>Condition</b>: [M.name] is suffering mild pain.</span>")
 			if(41 to 60)
-				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering significant pain.</span>")
+				to_chat(user, "<span class='notice'><b>Condition</b>: [M.name] is suffering significant pain.</span>")
 			if(21 to 40)
-				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering severe pain.</span>")
+				to_chat(user, "<span class='notice'><b>Condition</b>: [M.name] is suffering severe pain.</span>")
 			else
-				to_chat(usr, "<span class='notice'><b>Condition</b>: [M.name] is suffering excruciating pain.</span>")
+				to_chat(user, "<span class='notice'><b>Condition</b>: [M.name] is suffering excruciating pain.</span>")
 				thoughts = "haunted by their own mortality"
 
 		switch(M.a_intent)
 			if(I_HELP)
-				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense benevolent thoughts from [M.name].</span>")
+				to_chat(user, "<span class='notice'><b>Mood</b>: You sense benevolent thoughts from [M.name].</span>")
 			if(I_DISARM)
-				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense cautious thoughts from [M.name].</span>")
+				to_chat(user, "<span class='notice'><b>Mood</b>: You sense cautious thoughts from [M.name].</span>")
 			if(I_GRAB)
-				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense hostile thoughts from [M.name].</span>")
+				to_chat(user, "<span class='notice'><b>Mood</b>: You sense hostile thoughts from [M.name].</span>")
 			if(I_HARM)
-				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense cruel thoughts from [M.name].</span>")
+				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)
 						continue
 					thoughts = "thinking about punching [L.name]"
 					break
 			else
-				to_chat(usr, "<span class='notice'><b>Mood</b>: You sense strange thoughts from [M.name].</span>")
+				to_chat(user, "<span class='notice'><b>Mood</b>: You sense strange thoughts from [M.name].</span>")
 
 		if(istype(M,/mob/living/carbon/human))
 			var/numbers[0]
@@ -613,11 +605,11 @@
 				numbers += H.mind.initial_account.account_number
 				numbers += H.mind.initial_account.remote_access_pin
 			if(numbers.len>0)
-				to_chat(usr, "<span class='notice'><b>Numbers</b>: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].</span>")
-		to_chat(usr, "<span class='notice'><b>Thoughts</b>: [M.name] is currently [thoughts].</span>")
+				to_chat(user, "<span class='notice'><b>Numbers</b>: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].</span>")
+		to_chat(user, "<span class='notice'><b>Thoughts</b>: [M.name] is currently [thoughts].</span>")
 
 		if(EMPATH in M.mutations)
-			to_chat(M, "<span class='warning'>You sense [usr.name] reading your mind.</span>")
+			to_chat(M, "<span class='warning'>You sense [user.name] reading your mind.</span>")
 		else if(prob(5) || M.mind.assigned_role=="Chaplain")
 			to_chat(M, "<span class='warning'>You sense someone intruding upon your thoughts...</span>")
 		return

code/game/gamemodes/nuclear/nuclear_challenge.dm

@@ -1,5 +1,5 @@
 #define CHALLENGE_TIME_LIMIT 6000
-#define MIN_CHALLENGE_PLAYERS 50
+#define CHALLENGE_MIN_PLAYERS 50
 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable.
 
 /obj/item/device/nuclear_challenge
@@ -9,33 +9,42 @@
 	desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault.  \
 	Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals.  \
 	Must be used within five minutes, or your benefactors will lose interest."
-	var/declaring_war = 0
-
-
+	var/declaring_war = FALSE
 
 /obj/item/device/nuclear_challenge/attack_self(mob/living/user)
-	if(declaring_war)
-		return
-	if(player_list.len < MIN_CHALLENGE_PLAYERS)
-		to_chat(user, "The enemy crew is too small to be worth declaring war on.")
-		return
-	if(!is_admin_level(user.z))
-		to_chat(user, "You have to be at your base to use this.")
+	if(!check_allowed(user))
 		return
 
-	if(world.time > CHALLENGE_TIME_LIMIT)
-		to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make  do with what you have on hand.")
+	declaring_war = TRUE
+	var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You have [-round((world.time-round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", "Yes", "No")
+	declaring_war = FALSE
+
+	if(!check_allowed(user))
 		return
 
-	declaring_war = 1
-	var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew?", "Declare war?", "Yes", "No")
 	if(are_you_sure == "No")
 		to_chat(user, "On second thought, the element of surprise isn't so bad after all.")
-		declaring_war = 0
 		return
 
 	var/war_declaration = "[user.real_name] has declared his intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them."
+
+	declaring_war = TRUE
+	var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No")
+	declaring_war = FALSE
+
+	if(!check_allowed(user))
+		return
+
+	if(custom_threat == "Yes")
+		declaring_war = TRUE
+		war_declaration = stripped_input(user, "Insert your custom declaration", "Declaration")
+		declaring_war = FALSE
+
+	if(!check_allowed(user) || !war_declaration)
+		return
+
 	event_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg')
+
 	to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.")
 
 	for(var/obj/machinery/computer/shuttle/syndicate/S in machines)
@@ -47,7 +56,25 @@
 	config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY
 	qdel(src)
 
+/obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user)
+	if(declaring_war)
+		to_chat(user, "You are already in the process of declaring war! Make your mind up.")
+		return FALSE
+	if(player_list.len < CHALLENGE_MIN_PLAYERS)
+		to_chat(user, "The enemy crew is too small to be worth declaring war on.")
+		return FALSE
+	if(!is_admin_level(user.z))
+		to_chat(user, "You have to be at your base to use this.")
+		return FALSE
+	if(world.time > CHALLENGE_TIME_LIMIT)
+		to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make  do with what you have on hand.")
+		return FALSE
+	for(var/obj/machinery/computer/shuttle/syndicate/S in machines)
+		if(S.moved)
+			to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.")
+			return FALSE
+	return TRUE
 
 #undef CHALLENGE_TIME_LIMIT
-#undef MIN_CHALLENGE_PLAYERS
+#undef CHALLENGE_MIN_PLAYERS
 #undef CHALLENGE_SHUTTLE_DELAY

code/game/jobs/job/silicon.dm

@@ -8,7 +8,7 @@
 	supervisors = "your laws"
 	req_admin_notify = 1
 	minimal_player_age = 30
-	exp_requirements = 600
+	exp_requirements = 1200
 	exp_type = EXP_TYPE_CREW
 
 	equip(var/mob/living/carbon/human/H)

code/game/jobs/job/supervisor.dm

@@ -13,7 +13,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
 	access = list() 			//See get_access()
 	minimal_access = list() 	//See get_access()
 	minimal_player_age = 30
-	exp_requirements = 600
+	exp_requirements = 1200
 	exp_type = EXP_TYPE_CREW
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -237,6 +237,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
 	minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
 	alt_titles = list("Lawyer","Public Defender")
 	minimal_player_age = 30
+	exp_requirements = 300
+	exp_type = EXP_TYPE_CREW
 	idtype = /obj/item/weapon/card/id/security
 
 	equip(var/mob/living/carbon/human/H)

code/game/mecha/combat/gygax.dm

@@ -46,17 +46,13 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
 	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter
+	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
 	ME.attach(src)
 
-/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
-	if(C)
-		C.forceMove(src)
-		cell = C
-		return
-	cell = new(src)
+/obj/mecha/combat/gygax/dark/add_cell()
+	cell = new /obj/item/weapon/stock_parts/cell/bluespace(src)
 	cell.charge = 30000
 	cell.maxcharge = 30000
 

code/game/mecha/combat/marauder.dm

@@ -50,6 +50,11 @@
 	force = 55
 	max_equip = 5
 
+/obj/mecha/combat/marauder/seraph/add_cell()
+	cell = new /obj/item/weapon/stock_parts/cell/bluespace(src)
+	cell.charge = 40000
+	cell.maxcharge = 40000
+
 /obj/mecha/combat/marauder/seraph/loaded/New()
 	..()//Let it equip whatever is needed.
 	var/obj/item/mecha_parts/mecha_equipment/ME
@@ -61,7 +66,7 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src)
 	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise(src)
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
 	ME.attach(src)

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

@@ -9,17 +9,25 @@
 	icon_state = "mecha_teleport"
 	origin_tech = "bluespace=10"
 	equip_cooldown = 150
-	energy_drain = 1000
+	energy_drain = 8000
 	range = RANGED
+	var/tele_precision = 4
 
 /obj/item/mecha_parts/mecha_equipment/teleporter/action(atom/target)
 	if(!action_checks(target) || !is_teleport_allowed(loc.z))
 		return
 	var/turf/T = get_turf(target)
 	if(T)
-		do_teleport(chassis, T, 4)
+		chassis.use_power(energy_drain)
+		do_teleport(chassis, T, tele_precision)
 		return 1
 
+/obj/item/mecha_parts/mecha_equipment/teleporter/precise
+	name = "upgraded teleporter"
+	desc = "An exosuit module that allows exosuits to teleport to any position in view. This is the high-precision, energy-efficient version."
+	origin_tech = "bluespace=13"
+	energy_drain = 1000
+	tele_precision = 1
 
 
 ////////////////////////////////////////////// WORMHOLE GENERATOR //////////////////////////////////////////

code/game/objects/effects/effect_system.dm

@@ -750,7 +750,7 @@ steam.start() -- spawns the effect
 				var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)
 				I.dir = src.holder.dir
 				flick("ion_fade", I)
-				I.icon_state = "blank"
+				I.icon_state = ""
 				spawn( 20 )
 					if(I)
 						I.delete()
@@ -812,8 +812,8 @@ steam.start() -- spawns the effect
 					II.dir = src.holder.dir
 					flick("ion_fade", I)
 					flick("ion_fade", II)
-					I.icon_state = "blank"
-					II.icon_state = "blank"
+					I.icon_state = ""
+					II.icon_state = ""
 					spawn( 20 )
 						if(I) I.delete()
 						if(II) II.delete()

code/game/objects/items/crayons.dm

@@ -77,7 +77,7 @@
 	drawtype = temp
 	update_window(usr)
 
-/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
+/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity)
 	if(!proximity) return
 	if(is_type_in_list(target,validSurfaces))
 		var/temp = "rune"
@@ -95,17 +95,22 @@
 				if(!uses)
 					to_chat(user, "<span class='danger'>You used up your [name]!</span>")
 					qdel(src)
-	return
 
-/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
+/obj/item/toy/crayon/attack(mob/M, mob/user)
 	var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
 	if(M == user)
-		to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			if(!H.check_has_mouth())
+				to_chat(user, "<span class='warning'>You do not have a mouth!</span>")
+				return
+		playsound(loc, 'sound/items/eatfood.ogg', 50, 0)
+		to_chat(user, "<span class='notice'>You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!</span>")
 		user.nutrition += 5
 		if(uses)
 			uses -= 5
 			if(uses <= 0)
-				to_chat(user, "<span class='danger'>There is no more of [name] left!</span>")
+				to_chat(user, "<span class='warning'>There is no more of [name] left!</span>")
 				qdel(src)
 	else
 		..()

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

@@ -25,10 +25,7 @@
 	ui_interact(user)
 
 /obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user)
-		return
-
-	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+	if(!isliving(user) || user.incapacitated())
 		return
 
 	song.ui_interact(user, ui_key, ui, force_open)

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

@@ -11,11 +11,16 @@
 	var/obj/item/device/radio/radio
 	var/looking_for_personality = 0
 	var/mob/living/silicon/pai/pai
+	var/list/faction = list("neutral") // The factions the pAI will inherit from the card
+	
+/obj/item/device/paicard/syndicate
+	name = "syndicate personal AI device"
+	faction = list("syndicate")
 
 /obj/item/device/paicard/relaymove(var/mob/user, var/direction)
 	if(user.stat || user.stunned)
 		return
-	var/obj/item/weapon/rig/rig = src.get_rig()
+	var/obj/item/weapon/rig/rig = get_rig()
 	if(istype(rig))
 		rig.forced_move(direction, user)
 
@@ -260,7 +265,7 @@
 			to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.")
 			return
 		last_request = world.time / 10
-		src.looking_for_personality = 1
+		looking_for_personality = 1
 		paiController.findPAI(src, usr)
 	if(href_list["wipe"])
 		var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
@@ -297,33 +302,33 @@
 //		WIRE_TRANSMIT = 4
 
 /obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality)
-	src.pai = personality
-	src.overlays += "pai-happy"
+	pai = personality
+	overlays += "pai-happy"
 
 /obj/item/device/paicard/proc/removePersonality()
-	src.pai = null
-	src.overlays.Cut()
-	src.overlays += "pai-off"
+	pai = null
+	overlays.Cut()
+	overlays += "pai-off"
 
 /obj/item/device/paicard
 	var/current_emotion = 1
 /obj/item/device/paicard/proc/setEmotion(var/emotion)
 	if(pai)
-		src.overlays.Cut()
+		overlays.Cut()
 		switch(emotion)
-			if(1) src.overlays += "pai-happy"
-			if(2) src.overlays += "pai-cat"
-			if(3) src.overlays += "pai-extremely-happy"
-			if(4) src.overlays += "pai-face"
-			if(5) src.overlays += "pai-laugh"
-			if(6) src.overlays += "pai-off"
-			if(7) src.overlays += "pai-sad"
-			if(8) src.overlays += "pai-angry"
-			if(9) src.overlays += "pai-what"
+			if(1) overlays += "pai-happy"
+			if(2) overlays += "pai-cat"
+			if(3) overlays += "pai-extremely-happy"
+			if(4) overlays += "pai-face"
+			if(5) overlays += "pai-laugh"
+			if(6) overlays += "pai-off"
+			if(7) overlays += "pai-sad"
+			if(8) overlays += "pai-angry"
+			if(9) overlays += "pai-what"
 		current_emotion = emotion
 
 /obj/item/device/paicard/proc/alertUpdate()
-	var/turf/T = get_turf_or_move(src.loc)
+	var/turf/T = get_turf_or_move(loc)
 	for(var/mob/M in viewers(T))
 		M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2)
 

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

@@ -30,10 +30,7 @@
 	ui_interact(user)
 
 /obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user)
-		return
-
-	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+	if(!isliving(user) || user.incapacitated())
 		return
 
 	song.ui_interact(user, ui_key, ui, force_open)

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

@@ -7,7 +7,7 @@ RCD
 /obj/item/weapon/rcd
 	name = "rapid-construction-device (RCD)"
 	desc = "A device used to rapidly build and deconstruct walls and floors."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "rcd"
 	opacity = 0
 	density = 0

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

@@ -6,8 +6,8 @@ RSF
 /obj/item/weapon/rsf
 	name = "\improper Rapid-Service-Fabricator"
 	desc = "A device used to rapidly deploy service items."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "rcd"
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "rsf"
 	opacity = 0
 	density = 0
 	anchored = 0.0

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

@@ -12,47 +12,42 @@
  *		Revolver Conversion Kit
  */
 
-/*
- * Wrench
- */
+//Wrench
 /obj/item/weapon/wrench
 	name = "wrench"
 	desc = "A wrench with common uses. Can be found in your hand."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "wrench"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
-	throwforce = 7.0
+	force = 5
+	throwforce = 7
 	w_class = 2
 	materials = list(MAT_METAL=150)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 
-
-/*
- * Screwdriver
- */
+//Screwdriver
 /obj/item/weapon/screwdriver
 	name = "screwdriver"
 	desc = "You can be totally screwy with this."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "screwdriver"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
+	force = 5
 	w_class = 1
-	throwforce = 5.0
+	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=75)
 	attack_verb = list("stabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 
-	suicide_act(mob/user)
-		to_chat(viewers(user), pick("<span class='suicide'>[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</span>", \
-									"<span class='suicide'>[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.</span>"))
-		return(BRUTELOSS)
+/obj/item/weapon/screwdriver/suicide_act(mob/user)
+	to_chat(viewers(user), pick("<span class='suicide'>[user] is stabbing the [name] into \his temple! It looks like \he's trying to commit suicide.</span>", \
+								"<span class='suicide'>[user] is stabbing the [name] into \his heart! It looks like \he's trying to commit suicide.</span>"))
+	return(BRUTELOSS)
 
 /obj/item/weapon/screwdriver/New()
 	switch(pick("red","blue","purple","brown","green","cyan","yellow"))
@@ -82,7 +77,7 @@
 		src.pixel_y = rand(0, 16)
 	return
 
-/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(!istype(M) || user.a_intent == I_HELP)
 		return ..()
 	if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
@@ -91,17 +86,15 @@
 		M = user
 	return eyestab(M,user)
 
-/*
- * Wirecutters
- */
+//Wirecutters
 /obj/item/weapon/wirecutters
 	name = "wirecutters"
 	desc = "This cuts wires."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "cutters"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 6.0
+	force = 6
 	throw_speed = 3
 	throw_range = 7
 	w_class = 2
@@ -112,51 +105,40 @@
 	sharp = 1
 	edge = 1
 
-/obj/item/weapon/wirecutters/New(loc, var/param_color = null)
+/obj/item/weapon/wirecutters/New(loc, param_color = null)
 	..()
 	if((!param_color && prob(50)) || param_color == "yellow")
 		icon_state = "cutters-y"
 		item_state = "cutters_yellow"
 
-/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob)
-	if(istype(C) && C.handcuffed)
-		if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
-			usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
-			"You cut \the [C]'s restraints with \the [src]!",\
+/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/H, mob/user)
+	if(istype(H) && H.handcuffed)
+		if(istype(H.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
+			usr.visible_message("\The [usr] cuts \the [H]'s restraints with \the [src]!",\
+			"You cut \the [H]'s restraints with \the [src]!",\
 			"You hear cable being cut.")
-			C.handcuffed = null
-			if(C.buckled && C.buckled.buckle_requires_restraints)
-				C.buckled.unbuckle_mob()
-			C.update_handcuffed()
+			H.handcuffed = null
+			if(H.buckled && H.buckled.buckle_requires_restraints)
+				H.buckled.unbuckle_mob()
+			H.update_handcuffed()
 			return
 	else
 		..()
 
-/*
- * Welding Tool
- */
+//Welding Tool
 /obj/item/weapon/weldingtool
 	name = "welding tool"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "welder"
-	item_state = "welder"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-
-	//Amount of OUCH when it's thrown
 	force = 3
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	w_class = 2
-
-	//Cost to make in the autolathe
 	materials = list(MAT_METAL=70, MAT_GLASS=30)
-
-	//R&D tech level
 	origin_tech = "engineering=1"
-
-	//Welding tool specific stuff
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
 	var/status = 1 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
 	var/max_fuel = 20 	//The max amount of fuel the welder can hold
@@ -198,8 +180,8 @@
 	update_torch()
 	return
 
-/obj/item/weapon/weldingtool/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
+/obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params)
+	if(isscrewdriver(I))
 		flamethrower_screwdriver(I, user)
 	if(istype(I, /obj/item/stack/rods))
 		flamethrower_rods(I, user)
@@ -231,7 +213,7 @@
 	if(isturf(location))
 		location.hotspot_expose(700, 5)
 
-/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/weldingtool/attack(mob/M, mob/user)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
@@ -289,7 +271,7 @@
 	return reagents.get_reagent_amount("fuel")
 
 //Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
-/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/living/M = null)
+/obj/item/weapon/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
 	if(!welding || !check_fuel())
 		return 0
 	if(get_fuel() >= amount)
@@ -379,6 +361,7 @@
 	name = "Industrial Welding Tool"
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
+	icon_state = "welder"
 	max_fuel = 40
 	materials = list(MAT_METAL=70, MAT_GLASS=60)
 	origin_tech = "engineering=2"
@@ -402,9 +385,8 @@
 
 /obj/item/weapon/weldingtool/hugetank
 	name = "Upgraded Welding Tool"
-	desc = "An upgraded welder based of the industrial welder."
+	desc = "An upgraded welder based off the industrial welder."
 	icon_state = "upindwelder"
-	item_state = "upindwelder"
 	max_fuel = 80
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
@@ -414,15 +396,14 @@
 	name = "Experimental Welding Tool"
 	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
 	icon_state = "exwelder"
-	item_state = "exwelder"
 	max_fuel = 40
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=4;plasmatech=3"
-	var/last_gen = 0
 	change_icons = 0
 	can_off_process = 1
 	light_intensity = 1
+	var/last_gen = 0
 
 /obj/item/weapon/weldingtool/experimental/proc/fuel_gen()
 	if(!welding && !last_gen)
@@ -436,19 +417,16 @@
 	if(reagents.total_volume < max_fuel)
 		fuel_gen()
 
-/*
- * Crowbar
- */
-
+//Crowbar
 /obj/item/weapon/crowbar
 	name = "pocket crowbar"
 	desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "crowbar"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
-	throwforce = 7.0
+	force = 5
+	throwforce = 7
 	item_state = "crowbar"
 	w_class = 2
 	materials = list(MAT_METAL=50)
@@ -456,7 +434,6 @@
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 
 /obj/item/weapon/crowbar/red
-	icon = 'icons/obj/items.dmi'
 	icon_state = "red_crowbar"
 	item_state = "crowbar_red"
 
@@ -480,14 +457,14 @@
 	origin_tech = "combat=2"
 	var/open = 0
 
-	New()
-		..()
-		update_icon()
-
+/obj/item/weapon/conversion_kit/New()
+	..()
 	update_icon()
-		icon_state = "[initial(icon_state)]_[open]"
 
-	attack_self(mob/user as mob)
-		open = !open
-		to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
-		update_icon()
+/obj/item/weapon/conversion_kit/update_icon()
+	icon_state = "[initial(icon_state)]_[open]"
+
+/obj/item/weapon/conversion_kit/attack_self(mob/user)
+	open = !open
+	to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
+	update_icon()

code/game/objects/structures/musician.dm

@@ -138,10 +138,10 @@
 	return data
 
 /datum/song/Topic(href, href_list)
-	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained())
+	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || usr.incapacitated())
 		usr << browse(null, "window=instrument")
 		usr.unset_machine()
-		return
+		return 1
 
 	instrumentObj.add_fingerprint(usr)
 
@@ -168,6 +168,8 @@
 		//split into lines
 		spawn()
 			lines = splittext(t, "\n")
+			if(lines.len == 0)
+				return 1
 			if(copytext(lines[1],1,6) == "BPM: ")
 				tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
 				lines.Cut(1,2)
@@ -291,7 +293,7 @@
 	ui_interact(user)
 
 /obj/structure/piano/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user || !anchored)
+	if(!isliving(user) || user.incapacitated() || !anchored)
 		return
 
 	song.ui_interact(user, ui_key, ui, force_open)

code/game/response_team.dm

@@ -260,6 +260,7 @@ var/ert_request_answered = 0
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
 			pda.icon_state = "pda-engineer"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
+			M.job = "ERT Engineering"
 
 
 		if("Security")
@@ -284,7 +285,7 @@ var/ert_request_answered = 0
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
 			pda.icon_state = "pda-security"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
-
+			M.job = "ERT Security"
 
 		if("Medic")
 			medical_slots -= 1
@@ -306,7 +307,7 @@ var/ert_request_answered = 0
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
 			pda.icon_state = "pda-medical"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
-
+			M.job = "ERT Medical"
 
 		if("Commander")
 			command_slots = 0
@@ -333,6 +334,7 @@ var/ert_request_answered = 0
 			pda.ownjob = "Emergency Response Team Leader"
 			pda.name = "PDA-[M.real_name] ([pda.ownjob])"
 			M.equip_to_slot_or_del(pda, slot_wear_pda)
+			M.job = "ERT Commander"
 
 /datum/response_team/proc/cannot_send_team()
 	event_announcement.Announce("[station_name()], we are unfortunately unable to send you an Emergency Response Team at this time.", "ERT Unavailable")