Merge pull request #375 from Fox-McCloud/Thickmaterial

Thickmaterial

code/game/gamemodes/changeling/changeling.dm

@@ -120,9 +120,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 			var/datum/objective/escape/escape_with_identity/identity_theft = new
 			identity_theft.owner = changeling
 			identity_theft.target = kill_objective.target
+			identity_theft.target_real_name = kill_objective.target.current.real_name //Whoops, forgot this.
 			if(identity_theft.target && identity_theft.target.current)
-				var/target_real_name = identity_theft.target.current.real_name
-				identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [identity_theft.target.assigned_role] while wearing their identification card."
+				identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [identity_theft.target_real_name], the [identity_theft.target.assigned_role] while wearing their identification card."
 			else
 				identity_theft.explanation_text = "Free objective"
 			changeling.objectives += identity_theft
@@ -310,4 +310,4 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 		user << "<span class='warning'>We already have this DNA in storage!</span>"
 
 	return 1
-	
+	

code/game/gamemodes/game_mode.dm

@@ -42,7 +42,7 @@
 /obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
-/obj/item/weapon/pen/paralysis:3:Paralysis Pen;
+/obj/item/weapon/pen/sleepy:3:Sleepy Pen;
 /obj/item/weapon/soap/syndie:1:Syndicate Soap;
 /obj/item/weapon/cartridge/syndicate:3:Detomatix PDA Cartridge;
 Whitespace:Seperator;

code/game/gamemodes/objective.dm

@@ -749,12 +749,14 @@ datum/objective/absorb
 			return 0
 
 datum/objective/destroy
+	var/target_real_name
 	find_target()
 		var/list/possible_targets = active_ais(1)
 		var/mob/living/silicon/ai/target_ai = pick(possible_targets)
 		target = target_ai.mind
 		if(target && target.current)
-			explanation_text = "Destroy [target.current.real_name], the experimental AI."
+			target_real_name = target.current.real_name
+			explanation_text = "Destroy [target_real_name], the AI."
 		else
 			explanation_text = "Free Objective"
 		return target

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

@@ -19,17 +19,13 @@
 		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return 1
 
+
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.display_name == "head")
-			if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
-				user << "<span class='danger'>You can't apply [src] through [H.head]!</span>"
-				return 1
-		else
-			if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
-				user << "<span class='danger'>You can't apply [src] through [H.wear_suit]!</span>"
+		if(isliving(M))
+			if(!M.can_inject(user, 1))
 				return 1
 
 		if(affecting.status & ORGAN_ROBOT)
@@ -48,7 +44,7 @@
 		use(1)
 
 	M.updatehealth()
-	
+
 /obj/item/stack/medical/bruise_pack
 	name = "roll of gauze"
 	singular_name = "gauze length"
@@ -82,12 +78,12 @@
 						user.visible_message( 	"\blue [user] places a bandaid over \the [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You place a bandaid over \the [W.desc] on [M]'s [affecting.display_name]." )
 
-					affecting.heal_damage(src.heal_brute, src.heal_burn, 0)							
+					affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
 					use(1)
 		else
 			M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
 			use(1)
-			
+
 /obj/item/stack/medical/ointment
 	name = "ointment"
 	desc = "Used to treat those nasty burns."
@@ -112,7 +108,7 @@
 			else
 				user.visible_message( 	"\blue [user] salves the wounds on [M]'s [affecting.display_name].", \
 										"\blue You salve the wounds on [M]'s [affecting.display_name]." )
-				affecting.heal_damage(src.heal_brute, src.heal_burn, 0)											
+				affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery

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

@@ -12,7 +12,7 @@
 
 			if("stealth")
 				new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
-				new /obj/item/weapon/pen/paralysis(src)
+				new /obj/item/weapon/pen/sleepy(src)
 				new /obj/item/device/chameleon(src)
 				return