Merge branch 'master' into bleeding-edge-freeze

code/datums/organs/organ_external.dm

@@ -209,6 +209,7 @@
 		if(BURN)
 			size_names = typesof(/datum/wound/burn/) - /datum/wound/burn/
 
+	size = min(size,size_names.len)
 	var/wound_type = size_names[size]
 	W = new wound_type(damage)
 

code/datums/organs/wound.dm

@@ -172,24 +172,25 @@ datum/wound/cut/massive
 /datum/wound/bruise/monumental
 
 // implement sub-paths by starting at a later stage
-/datum/wound/bruise/huge
-	current_stage = 1
 
-/datum/wound/bruise/large
-	current_stage = 2
-
-/datum/wound/bruise/moderate
-	current_stage = 3
+/datum/wound/bruise/tiny
+	current_stage = 5
 	needs_treatment = 0
 
 /datum/wound/bruise/small
 	current_stage = 4
 	needs_treatment = 0
 
-/datum/wound/bruise/tiny
-	current_stage = 5
+/datum/wound/bruise/moderate
+	current_stage = 3
 	needs_treatment = 0
 
+/datum/wound/bruise/large
+	current_stage = 2
+
+/datum/wound/bruise/huge
+	current_stage = 1
+
 /** BURNS **/
 /datum/wound/burn/moderate
 	stages = list("ripped burn" = 10, "moderate burn" = 5, "moderate salved burn" = 2, "fresh skin" = 0)

code/game/gamemodes/game_mode.dm

@@ -64,8 +64,8 @@ Whitespace:Seperator;
 Implants;
 /obj/item/weapon/storage/box/syndie_kit/imp_freedom:3:Freedom Implant;
 /obj/item/weapon/storage/box/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
-/obj/item/weapon/implant/explosive:6:Explosive Implant (DANGER!);
-/obj/item/weapon/implant/compressed:4:Compressed Matter Implant;Whitespace:Seperator;
+/obj/item/weapon/storage/box/syndie_kit/imp_explosive:6:Explosive Implant (DANGER!);
+/obj/item/weapon/storage/box/syndie_kit/imp_compress:4:Compressed Matter Implant;Whitespace:Seperator;
 (Pointless) Badassery;
 /obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"}
 

code/game/gamemodes/traitor/traitor.dm

@@ -294,6 +294,6 @@
 
 	// Tell them about people they might want to contact.
 	var/mob/living/carbon/human/M = get_nt_opposed()
-	if(M != traitor_mob)
+	if(M && M != traitor_mob)
 		traitor_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them."
 		traitor_mob.mind.store_memory("<b>Potential Collaborator</b>: [M.real_name]")

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

@@ -440,7 +440,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 	activate()
 		var/turf/t = get_turf(src)
-		src.scanned.loc = t
+		put_in_hands(t)
 		del src
 
 	implanted(mob/source as mob)

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

@@ -83,7 +83,7 @@
 
 /obj/item/weapon/implanter/compressed
 	name = "implanter (C)"
-	icon_state = "cimplanter0"
+	icon_state = "cimplanter1"
 
 /obj/item/weapon/implanter/compressed/New()
 	imp = new /obj/item/weapon/implant/compressed( src )
@@ -95,11 +95,11 @@
 	if (imp)
 		var/obj/item/weapon/implant/compressed/c = imp
 		if(!c.scanned)
-			icon_state = "cimplanter0"
-		else
 			icon_state = "cimplanter1"
+		else
+			icon_state = "cimplanter2"
 	else
-		icon_state = "cimplanter2"
+		icon_state = "cimplanter0"
 	return
 
 /obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob)

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

@@ -83,24 +83,21 @@
 	O.update()
 	return
 
-/*/obj/item/weapon/storage/box/syndie_kit/imp_compress
-	name = "Compressed Matter Implant (with injector)"
+/obj/item/weapon/storage/box/syndie_kit/imp_compress
+	name = "box (C)"
 
-/obj/item/weapon/storage/syndie_kit/imp_compress/New()
+/obj/item/weapon/storage/box/syndie_kit/imp_compress/New()
 	new /obj/item/weapon/implanter/compressed(src)
 	..()
 	return
 
-/obj/item/weapon/storage/syndie_kit/imp_explosive
-	name = "Explosive Implant (with injector)"
+/obj/item/weapon/storage/box/syndie_kit/imp_explosive
+	name = "box (E)"
 
-/obj/item/weapon/storage/syndie_kit/imp_explosive/New()
-	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
-	O.imp = new /obj/item/weapon/implant/explosive(O)
-	O.name = "(BIO-HAZARD) BIO-detpack"
-	O.update()
+/obj/item/weapon/storage/box/syndie_kit/imp_explosive/New()
+	new /obj/item/weapon/implanter/explosive(src)
 	..()
-	return*/
+	return
 
 /obj/item/weapon/storage/box/syndie_kit/imp_uplink
 	name = "Uplink Implant (with injector)"