Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency

code/game/objects/items/devices/PDA/PDA.dm

@@ -721,7 +721,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			var/mob/M = loc
 			M.put_in_hands(inserted_item)
 		else
-			inserted_item.forceMove(loc)
+			inserted_item.forceMove(get_turf(src))
 		to_chat(usr, "<span class='notice'>You remove \the [inserted_item] from \the [src].</span>")
 		inserted_item = null
 		update_icon()

code/game/objects/items/devices/radio/headset.dm

@@ -300,7 +300,9 @@
 
 	return
 
-/obj/item/device/radio/headset/AltClick(mob/user)
+/obj/item/device/radio/headset/AltClick(mob/living/user)
+	if(!istype(user) || !Adjacent(user) || user.incapacitated())
+		return
 	if (command)
 		use_command = !use_command
-		to_chat(user, "<span class='notice'>You toggle high-volume mode.</span>")
+		to_chat(user, "<span class='notice'>You toggle high-volume mode [use_command ? "on" : "off"].</span>")

code/game/objects/items/toys.dm

@@ -554,81 +554,6 @@
 	chattering = TRUE
 	phomeme = "griffin"
 
-/obj/item/toy/talking/skeleton
-	name = "skeleton action figure"
-	desc = "An action figure modeled after 'Oh-cee', the original content \
-		skeleton.\nNot suitable for infants or assistants under 36 months \
-		of age."
-	icon_state = "skeletonprize"
-	attack_verb = list("boned", "dunked on", "worked down to the bone")
-	chattering = TRUE
-
-	var/list/regular_messages = list(
-		"Why was the skeleton such a bad liar? \
-			Because you can see right through him!",
-		"When does a skeleton laugh? When something tickles his funny bone!",
-		"Why couldn't the skeleton win the beauty contest? \
-			 Because he had no body!",
-		"What do you call a skeleton in the winter? A numbskull!",
-		"What did the skeleton say before eating? Bone appetit!",
-		"What type of art do skeletons like? Skulltures!",
-		"What instrument do skeletons play? The trom-bone!",
-		"Why are skeletons always so calm? \
-			Because nothing gets under their skin!",
-		"How did the skeleton know it was going to rain? \
-			He could feel it in his bones.",
-		"Why did the skeleton go to the hospital? \
-			To get his ghoul stones removed.",
-		"Why can't skeletons play music in churches? \
-			Because they have no organs.",
-		"There's a skeleton inside everyone! Except slime people I guess...",
-		"The birds are too busy to notice me acting in the shadows!",
-		"Giraffes have the same number of bones in their necks as humans. \
-			You should never trust a giraffe.",
-		"When I meet a dog in the street, I always offer it a bone!",
-		"In corsetry, a bone is one of the rigid parts of a corset that \
-			forms its frame and gives it rigidity.",
-		"A person who plays the trombone is called a trombonist or \
-			trombone player.",
-		"Remember, compromise is for those without backbones!",
-		"If you go up to the captain and say the word 'bone' repeatedly, \
-			eventually he'll brig you.",
-		"Yo ho ho, shiver me bones!",
-		"So what you're saying is, you only love me for my legs?",
-		"You will never again find socks that match!",
-		"BONES! BONES! BONES!",
-		"Bones absorb x-rays, which is why radiation gives you superpowers.",
-		"Oh-cee! The ORIGINAL CONTENT SKELETON. Suitable for ages 36 months \
-			and up.",
-		"I just don't have the heart to judge you.",
-		"I don't have the stomach for this.",
-		"I'm a fighter, not a liver.",
-		"How can I see without eyeballs?",
-		"Ask your parents about 'boning', before you get pregnant.",
-		"Remember, a dog is for life, not just for christmas.")
-
-/obj/item/toy/talking/skeleton/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is trying to commit suicide with [src].</span>")
-
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		H.set_species(/datum/species/skeleton)
-
-	toy_talk(user, "RATTLE ME BONES")
-
-	user.Stun(5)
-	sleep(20)
-	return OXYLOSS
-
-/obj/item/toy/talking/skeleton/generate_messages()
-	return list(pick(regular_messages))
-
-/obj/item/toy/talking/skeleton/toy_talk(user, message)
-	phomeme = pick("sans", "papyrus")
-
-	span = "danger [phomeme]"
-	..()
-
 /*
 || A Deck of Cards for playing various games of chance ||
 */

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

@@ -3,10 +3,13 @@
 	desc = "And boom goes the weasel."
 	icon_state = "explosive"
 	origin_tech = "materials=2;combat=3;biotech=4;syndicate=4"
+	actions_types = list(/datum/action/item_action/explosive_implant)
+	// Explosive implant action is always availible.
 	var/weak = 2
 	var/medium = 0.8
 	var/heavy = 0.4
 	var/delay = 7
+	var/popup = FALSE // is the DOUWANNABLOWUP window open?
 
 /obj/item/weapon/implant/explosive/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>
@@ -27,8 +30,12 @@
 /obj/item/weapon/implant/explosive/activate(cause)
 	if(!cause || !imp_in)
 		return 0
-	if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your [name]? This will cause you to explode!", "[name] Confirmation", "Yes", "No") != "Yes")
-		return 0
+	if(cause == "action_button" || !popup)
+		popup = TRUE
+		var/response = alert(imp_in, "Are you sure you want to activate your [name]? This will cause you to explode!", "[name] Confirmation", "Yes", "No")
+		popup = FALSE
+		if(response == "No")
+			return 0
 	heavy = round(heavy)
 	medium = round(medium)
 	weak = round(weak)