Merge pull request #2387 from comma/master

Fixes issue #2384

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/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)"