Small Changes (#1836)

devices and tools.dm ~Advanced pinpointer added
implant.dm ~loyalty implants melt when EMP'd
nuclear_bomb.dm ~ code goes to delta when activated
microwave.dm ~ Fixes #1668
lockbox.dm ~ medal box added
exodus-1.dmm ~ medal box added
storage.dmi ~ medal box icon added
advanced pin pointer was 25 but after talking to some people they said 15 is better, I don't know though

code/datums/uplink/devices and tools.dm

@@ -9,6 +9,12 @@
 	item_cost = 2
 	path = /obj/item/weapon/storage/toolbox/syndicate
 
+/datum/uplink_item/item/tools/advancedpinpointer
+	name = "Advanced pinpointer"
+	item_cost = 15
+	path = /obj/item/weapon/pinpointer/advpinpointer
+	desc = "An advanced pinpointer that can find any target with DNA along with various other items."
+
 /datum/uplink_item/item/tools/money
 	name = "Operations Funding"
 	item_cost = 2

code/game/machinery/kitchen/microwave.dm

@@ -141,13 +141,13 @@
 		return 1
 	else if(istype(O,/obj/item/weapon/crowbar))
 		user.visible_message( \
-			"<span class='notice'>\The [user] begins [src.anchored ? "securing" : "unsecuring"] the microwave.</span>", \
-			"<span class='notice'>You attempt to [src.anchored ? "secure" : "unsecure"] the microwave.</span>"
+			"<span class='notice'>\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave.</span>", \
+			"<span class='notice'>You attempt to [src.anchored ? "unsecure" : "secure"] the microwave.</span>"
 			)
 		if (do_after(user,20))
 			user.visible_message( \
-			"<span class='notice'>\The [user] [src.anchored ? "secures" : "unsecures"] the microwave.</span>", \
-			"<span class='notice'>You [src.anchored ? "secure" : "unsecure"] the microwave.</span>"
+			"<span class='notice'>\The [user] [src.anchored ? "unsecures" : "secures"] the microwave.</span>", \
+			"<span class='notice'>You [src.anchored ? "unsecure" : "secure"] the microwave.</span>"
 			)
 			src.anchored = !src.anchored
 		else

code/game/machinery/nuclear_bomb.dm

@@ -11,6 +11,7 @@ var/bomb_set
 	var/lighthack = 0
 	var/timeleft = 120
 	var/timing = 0
+	var/alerted = 0
 	var/r_code = "ADMIN"
 	var/code = ""
 	var/yes_code = 0
@@ -290,6 +291,10 @@ var/bomb_set
 					update_icon()
 				else
 					secure_device()
+
+				if(alerted == 0)
+					set_security_level(SEC_LEVEL_DELTA)
+					alerted = 1
 			if (href_list["safety"])
 				if (wires.IsIndexCut(NUCLEARBOMB_WIRE_SAFETY))
 					usr << "<span class='warning'>Nothing happens, something might be wrong with the wiring.</span>"

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

@@ -346,6 +346,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
 			H << "<span class='notice'>You feel a surge of loyalty towards [company_name].</span>"
 		return 1
 
+	emp_act(severity)
+		if (malfunction)
+			return
+		malfunction = MALFUNCTION_TEMPORARY
+
+		activate("emp")
+		if(severity == 1)
+			if(prob(50))
+				meltdown()
+			else if (prob(50))
+				malfunction = MALFUNCTION_PERMANENT
+			processing_objects.Remove(src)
+			return
+		spawn(20)
+			malfunction--
+
+	implanted(mob/source as mob)
+		//mobname = source.real_name
+		processing_objects.Add(src)
+		return 1
 
 /obj/item/weapon/implant/adrenalin
 	name = "adrenalin"

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

@@ -99,3 +99,36 @@
 	New()
 		..()
 		new /obj/item/weapon/gun/energy/lawgiver(src)
+
+/obj/item/weapon/storage/lockbox/medal
+	name = "medal box"
+	desc = "A locked box used to store medals."
+	icon_state = "medalbox+l"
+	item_state = "syringe_kit"
+	w_class = 3
+	max_w_class = 2
+	req_access = list(access_captain)
+	icon_locked = "medalbox+l"
+	icon_closed = "medalbox"
+	icon_broken = "medalbox+b"
+
+/obj/item/weapon/storage/lockbox/medal/New()
+	..()
+	new /obj/item/clothing/accessory/medal
+	new /obj/item/clothing/accessory/medal
+	new /obj/item/clothing/accessory/medal/conduct
+	new /obj/item/clothing/accessory/medal/conduct
+	new /obj/item/clothing/accessory/medal/conduct
+	new /obj/item/clothing/accessory/medal/conduct
+	new /obj/item/clothing/accessory/medal/bronze_heart
+	new /obj/item/clothing/accessory/medal/bronze_heart
+	new /obj/item/clothing/accessory/medal/nobel_science
+	new /obj/item/clothing/accessory/medal/nobel_science
+	new /obj/item/clothing/accessory/medal/silver
+	new /obj/item/clothing/accessory/medal/iron/merit
+	new /obj/item/clothing/accessory/medal/silver/valor
+	new /obj/item/clothing/accessory/medal/silver/security
+	new /obj/item/clothing/accessory/medal/silver/security
+	new /obj/item/clothing/accessory/medal/gold
+
+