Merge pull request #820 from skull132/bug-fixes-Jan2016

Bug fixes jan2016

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

@@ -294,6 +294,8 @@
 
 			if(H.species.flags & IS_SYNTHETIC)
 				return
+			if(istype(H) && H.species.insulated)//Insulation
+				return
 
 			if(M.buckled && istype(M.buckled, /obj/structure/stool/bed/chair/wheelchair))
 				return ..()

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

@@ -52,6 +52,25 @@
 			flick("e_flash", M.flash)
 			M.Stun(2)
 			M.Weaken(10)
+			//Vaurca damage 29-012-15
+			var/mob/living/carbon/human/H = M
+			if(H.species.flags & IS_BUG)
+				var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
+				if(!E)
+					return
+				//Reworked damage 29/12/15
+				usr << "\red Your eyes burn with the intense light of the flash!."
+				E.damage += rand(10, 11)
+				if(E.damage > 12)
+					M.eye_blurry += rand(3,6)
+				if (E.damage >= E.min_broken_damage)
+					M.sdisabilities |= BLIND
+				else if (E.damage >= E.min_bruised_damage)
+					M.eye_blind = 5
+					M.eye_blurry = 5
+					M.disabilities |= NEARSIGHTED
+					spawn(100)
+						M.disabilities &= ~NEARSIGHTED
 
 
 

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

@@ -333,22 +333,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 
 	implanted(mob/M)
-		if(!istype(M, /mob/living/carbon/human))	return 0
+		if(!istype(M, /mob/living/carbon/human))
+			return 0
 		var/mob/living/carbon/human/H = M
-		if(H.mind in ticker.mode.head_revolutionaries)
+		if (H.mind in ticker.mode.head_revolutionaries)
 			H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!")
 			return 0
-		else if(H.mind in ticker.mode:revolutionaries)
+		else if (H.mind in ticker.mode:revolutionaries)
 			ticker.mode:remove_revolutionary(H.mind)
-		H << "\blue You feel a surge of loyalty towards Nanotrasen."
-		return 1
-
-	implanted(mob/M)
-		if(!istype(M, /mob/living/carbon/human))	return 0
-		var/mob/living/carbon/human/H = M
-		if(H.mind in ticker.mode:cult)
+		else if (H.mind in ticker.mode:cult)
 			ticker.mode:remove_cultist(M.mind)
-		H << "\blue The implant robs you of your faith in Nar-Sie, leaving only obedience to NanoTrasen."
+			H << "\blue The implant robs you of your faith in Nar-Sie, leaving only obedience to NanoTrasen."
+		else if (H.mind in ticker.mode:changelings)
+			H << "\blue <b>We have weaved our flesh around and isolated the simple chip. It has no effect on us.</b> But they do not know it yet..."
+		H << "\blue You feel a surge of loyalty towards Nanotrasen."
 		return 1
 
 //Alternatively!  This is the null-rod deconversion, if the above doesn't work.  There's two things down there and I don't know if that's okay.
@@ -386,14 +384,21 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		return dat
 
 
-	trigger(emote, mob/source as mob)
-		if (src.uses < 1)	return 0
+	trigger(emote, mob/living/carbon/human/source as mob)
+		if (src.uses < 1)
+			return 0
+		if (!istype(source))
+			return 0
 		if (emote == "pale")
 			src.uses--
 			source << "\blue You feel a sudden surge of energy!"
+			source.stat = 0
+			source.SetParalysis(0)
 			source.SetStunned(0)
 			source.SetWeakened(0)
-			source.SetParalysis(0)
+			source.lying = 0
+			source.setHalLoss(0)
+			source.update_canmove()
 
 		return
 

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

@@ -82,6 +82,16 @@
 	O.update()
 	return
 
+/obj/item/weapon/storage/box/syndie_kit/imp_adrenalin
+	name = "boxed adrenalin implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_adrenalin/New()
+	..()
+	var/obj/item/weapon/implanter/O = new(src)
+	O.imp = new /obj/item/weapon/implant/adrenalin(O)
+	O.update()
+	return
+
 /obj/item/weapon/storage/box/syndie_kit/imp_compress
 	name = "box (C)"