Merge pull request #2447 from Anewbe/implant

Explosive implants should no longer gib on limbs.

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

@@ -164,12 +164,10 @@ Implant Specifics:<BR>"}
 	if (malfunction == MALFUNCTION_PERMANENT)
 		return
 
-	var/need_gib = null
 	if(istype(imp_in, /mob/))
 		var/mob/T = imp_in
 		message_admins("Explosive implant triggered in [T] ([T.key]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>) ")
 		log_game("Explosive implant triggered in [T] ([T.key]).")
-		need_gib = 1
 
 		if(ishuman(imp_in))
 			if (elevel == "Localized Limb")
@@ -180,11 +178,11 @@ Implant Specifics:<BR>"}
 					if (istype(part,/obj/item/organ/external/chest) ||	\
 						istype(part,/obj/item/organ/external/groin) ||	\
 						istype(part,/obj/item/organ/external/head))
-						part.createwound(BRUISE, 60)	//mangle them instead
+						part.createwound(BRUISE, 80)	//mangle them instead
-						explosion(get_turf(imp_in), -1, -1, 2, 3)
+						explosion(get_turf(imp_in), -1, -1, 1, 3)
 						qdel(src)
 					else
-						explosion(get_turf(imp_in), -1, -1, 2, 3)
+						explosion(get_turf(imp_in), -1, -1, 1, 3)
 						part.droplimb(0,DROPLIMB_BLUNT)
 						qdel(src)
 			if (elevel == "Destroy Body")
@@ -197,9 +195,6 @@ Implant Specifics:<BR>"}
 		else
 			explosion(get_turf(imp_in), 0, 1, 3, 6)
 
-	if(need_gib)
-		imp_in.gib()
-
 	var/turf/t = get_turf(imp_in)
 
 	if(t)
@@ -249,10 +244,10 @@ Implant Specifics:<BR>"}
 				if (istype(part,/obj/item/organ/external/chest) ||	\
 					istype(part,/obj/item/organ/external/groin) ||	\
 					istype(part,/obj/item/organ/external/head))
-					part.createwound(BRUISE, 60)	//mangle them instead
+					part.createwound(BRUISE, 80)	//mangle them instead
 				else
 					part.droplimb(0,DROPLIMB_BLUNT)
-			explosion(get_turf(imp_in), -1, -1, 2, 3)
+			explosion(get_turf(imp_in), -1, -1, 1, 3)
 			qdel(src)
 
 /obj/item/weapon/implant/chem

html/changelogs/Anewbe - Explosive Implants.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Explosive implants should no longer gib the target if the setting is Localized Limb."