Merge branch 'dev-freeze' into dev

Conflicts:
	icons/obj/ammo.dmi

code/game/objects/items/weapons/cards_ids.dm

@@ -199,6 +199,27 @@
 	name = "agent card"
 	access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
 	origin_tech = "syndicate=3"
+	var/registered_user=null
+	
+/obj/item/weapon/card/id/syndicate/New(mob/user as mob)
+	..()
+	var/t = reject_bad_name(input(user, "What name would you like to put on this card?\nNode:  You can change this later by clicking on the ID card while it's in your hand.", "Agent card name", ishuman(user) ? user.real_name : user.name))
+	if(!t) 
+		alert("Invalid name.")
+		if(!registered_name) 
+			registered_name = ishuman(user) ? user.real_name : user.name
+	else
+		registered_name = t
+	var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN)
+	if(!u)
+		alert("Invalid assignment.")
+		assignment = "Assistant"
+	else
+		assignment = u
+	name = "[registered_name]'s ID Card ([assignment])"
+	user << "\blue You successfully forge the ID card."
+	registered_user = user
+	
 
 /obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
@@ -209,7 +230,6 @@
 			if(user.mind.special_role)
 				usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access."
 
-/obj/item/weapon/card/id/syndicate/var/mob/registered_user = null
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
 	if(!src.registered_name)
 		//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
@@ -228,7 +248,10 @@
 		src.name = "[src.registered_name]'s ID Card ([src.assignment])"
 		user << "\blue You successfully forge the ID card."
 		registered_user = user
-	else if(registered_user == user)
+	else if(!registered_user || registered_user == user)
+
+		if(!registered_user) registered_user = user  // First one to pick it up is the owner if there is ever a wild case New() doens't work.
+
 		switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
 			if("Rename")
 				var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26)

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

@@ -127,6 +127,7 @@ Implant Specifics:<BR>"}
 /obj/item/weapon/implant/explosive
 	name = "explosive implant"
 	desc = "A military grade micro bio-explosive. Highly dangerous."
+	var/elevel = "Localized Limb"
 	var/phrase = "supercalifragilisticexpialidocious"
 	icon_state = "implant_evil"
 
@@ -157,20 +158,50 @@ Implant Specifics:<BR>"}
 	activate()
 		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")
+					if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
+						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+						playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+						sleep(25)
+						if (istype(part,/datum/organ/external/chest) ||	\
+							istype(part,/datum/organ/external/groin) ||	\
+							istype(part,/datum/organ/external/head))
+							part.createwound(BRUISE, 60)	//mangle them instead
+							explosion(get_turf(imp_in), -1, -1, 2, 3)
+							del(src)
+						else
+							explosion(get_turf(imp_in), -1, -1, 2, 3)
+							part.droplimb(1)
+							del(src)
+				if (elevel == "Destroy Body")
+					explosion(get_turf(T), -1, 0, 1, 6)
+					T.gib()
+				if (elevel == "Full Explosion")
+					explosion(get_turf(T), 0, 1, 3, 6)
+					T.gib()
 
-			T.gib()
-		explosion(get_turf(imp_in), 1, 3, 4, 6, 3)
+			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)
 			t.hotspot_expose(3500,125)
 
 	implanted(mob/source as mob)
+		elevel = alert("What sort of explosion would you prefer?", "Implant Intent", "Localized Limb", "Destroy Body", "Full Explosion")
 		phrase = input("Choose activation phrase:") as text
 		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
 		phrase = sanitize_simple(phrase, replacechars)
@@ -215,7 +246,7 @@ Implant Specifics:<BR>"}
 						part.createwound(BRUISE, 60)	//mangle them instead
 					else
 						part.droplimb(1)
-				explosion(get_turf(imp_in), -1, -1, 2, 3, 3)
+				explosion(get_turf(imp_in), -1, -1, 2, 3)
 				del(src)
 
 /obj/item/weapon/implant/chem

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

@@ -97,7 +97,7 @@
 		"/obj/item/device/flashlight/pen",
 		"/obj/item/clothing/mask/surgical",
 		"/obj/item/clothing/gloves/latex",
-        "/obj/item/weapon/reagent_containers/hypospray/autoinjector"
+	        "/obj/item/weapon/reagent_containers/hypospray"
 	)
 
 
@@ -166,4 +166,4 @@
 	name = "inflatable duck"
 	desc = "No bother to sink or swim when you can just float!"
 	icon_state = "inflatable"
-	item_state = "inflatable"
+	item_state = "inflatable"