Merge remote-tracking branch 'upstream/master' into tgdice

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

@@ -848,7 +848,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		empulse(P.loc, 3, 6, 1)
 		message += "Your [P] emits a wave of electromagnetic energy!"
 	if(i>=25 && i<=40) //Smoke
-		var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+		var/datum/effect/effect/system/harmless_smoke_spread/S = new /datum/effect/effect/system/harmless_smoke_spread //Why was this chem_smoke_spread when there are no chems involved?
 		S.attach(P.loc)
 		S.set_up(P, 10, 0, P.loc)
 		playsound(P.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -884,9 +884,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			message += "It melts in a puddle of plastic."
 		else
 			message += "Your [P] shatters in a thousand pieces!"
-	
+
 	JFLOG("[M]'s PDA Detonated >>> [message]")
-	
+
 	if(M && isliving(M))
 		message = "\red" + message
 		M.show_message(message, 1)
@@ -1402,26 +1402,26 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		A.emp_act(severity)
 
 /**
-*	
+*
 *	JFLOG
-*	
+*
 *	These functions as well as all the log statements are being used to gather user data for how
-*	people are using the PDA files with the intent of revising them based on this data. 
-*	
-*	They are being added on 28/03/2015 and the intent is to remove them in two weeks. If you're 
-*	reading this and it's substantially past that point, you should remove anything marked with 
-*	'JFLOG'. 
-*	
-*	All changes should be contained to PDA.dm except the creation function which is contained in 
+*	people are using the PDA files with the intent of revising them based on this data.
+*
+*	They are being added on 28/03/2015 and the intent is to remove them in two weeks. If you're
+*	reading this and it's substantially past that point, you should remove anything marked with
+*	'JFLOG'.
+*
+*	All changes should be contained to PDA.dm except the creation function which is contained in
 *	job_controller.dm.
-*	
-*																				- Jack Fractal	
+*
+*																				- Jack Fractal
 **/
 
 
 /obj/item/device/pda/proc/JFLOG_DescribeSelf()
 	return "([src]|[cartridge ? cartridge.name : "None"])"
-	
+
 /obj/item/device/pda/proc/JFLOG(message as text)
 	if (config)
 		log_pda("[JFLOG_DescribeSelf()] >>> [message]")

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

@@ -0,0 +1,41 @@
+//copy pasta of the space piano, don't hurt me -Pete
+
+/obj/item/device/guitar
+	name = "guitar"
+	desc = "It's made of wood and has bronze strings."
+	icon = 'icons/obj/musician.dmi'
+	icon_state = "guitar"
+	item_state = "guitar"
+	icon_override = 'icons/mob/in-hand/tools.dmi'
+	force = 10
+	var/datum/song/handheld/song
+
+/obj/item/device/guitar/New()
+	song = new("guitar", src)
+	song.instrumentExt = "ogg"
+
+/obj/item/device/guitar/Destroy()
+	del(song)
+	song = null
+	..()
+
+/obj/item/device/guitar/attack_self(mob/user as mob)
+	interact(user)
+
+/obj/item/device/guitar/interact(mob/user as mob)
+	if(!user)
+		return
+
+	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+		return
+
+	user.set_machine(src)
+	song.interact(user)
+
+/datum/table_recipe/guitar
+	name = "Guitar"
+	result = /obj/item/device/guitar
+	reqs = list(/obj/item/stack/sheet/wood = 5,
+				/obj/item/stack/cable_coil = 6)
+	tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters)
+	time = 80

code/game/objects/items/toys.dm

@@ -1252,4 +1252,52 @@ obj/item/toy/cards/deck/syndicate/black
 		cooldown = 1
 		spawn(30) cooldown = 0
 		return
-	..()
+	..()
+
+// DND Character minis. Use the naming convention (type)character for the icon states.
+/obj/item/toy/character
+	icon = 'icons/obj/toy.dmi'
+	w_class = 2
+	pixel_z = 5
+
+/obj/item/toy/character/alien
+	name = "Xenomorph Miniature"
+	desc = "A miniature xenomorph. Scary!"
+	icon_state = "aliencharacter"
+/obj/item/toy/character/cleric
+	name = "Cleric Miniature"
+	desc = "A wee little cleric, with his wee little staff."
+	icon_state = "clericcharacter"
+/obj/item/toy/character/warrior
+	name = "Warrior Miniature"
+	desc = "That sword would make a decent toothpick."
+	icon_state = "warriorcharacter"
+/obj/item/toy/character/thief
+	name = "Thief Miniature"
+	desc = "Hey, where did my wallet go!?"
+	icon_state = "thiefcharacter"
+/obj/item/toy/character/wizard
+	name = "Wizard Miniature"
+	desc = "MAGIC!"
+	icon_state = "wizardcharacter"
+/obj/item/toy/character/cthulhu
+	name = "Cthulhu Miniature"
+	desc = "The dark lord has risen!"
+	icon_state = "darkmastercharacter"
+/obj/item/toy/character/lich
+	name = "Lich Miniature"
+	desc = "Murderboner extraordinaire."
+	icon_state = "lichcharacter"
+/obj/item/weapon/storage/box/characters
+	name = "Box of Miniatures"
+	desc = "The nerd's best friends."
+	icon_state = "box"
+/obj/item/weapon/storage/box/characters/New()
+	..()
+	new /obj/item/toy/character/alien(src)
+	new /obj/item/toy/character/cleric(src)
+	new /obj/item/toy/character/warrior(src)
+	new /obj/item/toy/character/thief(src)
+	new /obj/item/toy/character/wizard(src)
+	new /obj/item/toy/character/cthulhu(src)
+	new /obj/item/toy/character/lich(src)