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

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

@@ -2,14 +2,15 @@
 /obj/item/device/instrument
 	name = "generic instrument"
 	icon = 'icons/obj/musician.dmi'
+	lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
 	burn_state = FLAMMABLE
 	var/datum/song/handheld/song
 	var/instrumentId = "generic"
-	var/instrumentExt = "ogg"
+	var/instrumentExt = "mid"
 
 /obj/item/device/instrument/New()
-	song = new(instrumentId, src)
-	song.instrumentExt = instrumentExt
+	song = new(instrumentId, src, instrumentExt)
 	..()
 
 /obj/item/device/instrument/Destroy()
@@ -44,6 +45,7 @@
 	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
 	icon_state = "violin"
 	item_state = "violin"
+	instrumentExt = "ogg"
 	force = 10
 	hitsound = "swing_hit"
 	instrumentId = "violin"
@@ -55,11 +57,26 @@
 	item_state = "golden_violin"
 	burn_state = LAVA_PROOF
 
+/obj/item/device/instrument/piano_synth
+	name = "synthesizer"
+	desc = "An advanced electronic synthesizer that can be used as various instruments."
+	icon_state = "synth"
+	item_state = "synth"
+	instrumentId = "piano"
+	instrumentExt = "ogg"
+	var/static/list/insTypes = list("accordion" = "mid", "glockenspiel" = "mid", "guitar" = "ogg", "eguitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "ogg", "xylophone" = "mid")
+	actions_types = list(/datum/action/item_action/synthswitch)
+
+/obj/item/device/instrument/piano_synth/proc/changeInstrument(name = "piano")
+	song.instrumentDir = name
+	song.instrumentExt = insTypes[name]
+
 /obj/item/device/instrument/guitar
 	name = "guitar"
 	desc = "It's made of wood and has bronze strings."
 	icon_state = "guitar"
 	item_state = "guitar"
+	instrumentExt = "ogg"
 	force = 10
 	attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
 	hitsound = 'sound/effects/guitarsmash.ogg'
@@ -70,11 +87,79 @@
 	desc = "Makes all your shredding needs possible."
 	icon_state = "eguitar"
 	item_state = "eguitar"
+	instrumentExt = "ogg"
 	force = 12
 	attack_verb = list("played metal on", "shredded", "crashed", "smashed")
 	hitsound = 'sound/weapons/stringsmash.ogg'
 	instrumentId = "eguitar"
 
+/obj/item/device/instrument/glockenspiel
+	name = "glockenspiel"
+	desc = "Smooth metal bars perfect for any marching band."
+	icon_state = "glockenspiel"
+	item_state = "glockenspiel"
+	instrumentId = "glockenspiel"
+
+/obj/item/device/instrument/accordion
+	name = "accordion"
+	desc = "Pun-Pun not included."
+	icon_state = "accordion"
+	item_state = "accordion"
+	instrumentId = "accordion"
+
+/obj/item/device/instrument/saxophone
+	name = "saxophone"
+	desc = "This soothing sound will be sure to leave your audience in tears."
+	icon_state = "saxophone"
+	item_state = "saxophone"
+	instrumentId = "saxophone"
+
+/obj/item/device/instrument/trombone
+	name = "trombone"
+	desc = "How can any pool table ever hope to compete?"
+	icon_state = "trombone"
+	item_state = "trombone"
+	instrumentId = "trombone"
+
+/obj/item/device/instrument/recorder
+	name = "recorder"
+	desc = "Just like in school, playing ability and all."
+	icon_state = "recorder"
+	item_state = "recorder"
+	instrumentId = "recorder"
+
+/obj/item/device/instrument/harmonica
+	name = "harmonica"
+	desc = "For when you get a bad case of the space blues."
+	icon_state = "harmonica"
+	item_state = "harmonica"
+	instrumentId = "harmonica"
+	force = 5
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/device/instrument/xylophone
+	name = "xylophone"
+	desc = "a percussion instrument with a bright tone."
+	icon_state = "xylophone"
+	item_state = "xylophone"
+	instrumentId = "xylophone"
+
+/obj/item/device/instrument/bikehorn
+	name = "gilded bike horn"
+	desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."
+	icon_state = "bike_horn"
+	item_state = "bike_horn"
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	attack_verb = list("beautifully honks")
+	instrumentId = "bikehorn"
+	instrumentExt = "ogg"
+	w_class = WEIGHT_CLASS_TINY
+	force = 0
+	throw_speed = 3
+	throw_range = 7
+	hitsound = 'sound/items/bikehorn.ogg'
+
 /datum/crafting_recipe/violin
 	name = "Violin"
 	result = /obj/item/device/instrument/violin

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

@@ -363,7 +363,7 @@ REAGENT SCANNER
 	return
 
 /obj/item/device/mass_spectrometer
-	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample. Inject sample with syringe."
 	name = "mass-spectrometer"
 	icon_state = "spectrometer"
 	item_state = "analyzer"
@@ -377,7 +377,7 @@ REAGENT SCANNER
 	origin_tech = "magnets=2;biotech=1;plasmatech=2"
 	var/details = 0
 	var/datatoprint = ""
-	var/scanning = 1
+	var/scanning = TRUE
 	actions_types = list(/datum/action/item_action/print_report)
 
 /obj/item/device/mass_spectrometer/New()
@@ -400,8 +400,8 @@ REAGENT SCANNER
 		var/list/blood_traces = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
 			if(R.id != "blood")
-				reagents.clear_reagents()
 				to_chat(user, "<span class='warning'>The sample was contaminated! Please insert another sample.</span>")
+				reagents.clear_reagents()
 				return
 			else
 				blood_traces = params2list(R.data["trace_chem"])
@@ -412,7 +412,9 @@ REAGENT SCANNER
 				dat += "[R] ([blood_traces[R]] units) "
 			else
 				dat += "[R] "
-		to_chat(user, "[dat]")
+		to_chat(user, "Analysis completed. Chemicals found: [dat]")
+		scanning = FALSE
+		datatoprint = dat
 		reagents.clear_reagents()
 	return
 
@@ -424,6 +426,7 @@ REAGENT SCANNER
 
 /obj/item/device/mass_spectrometer/proc/print_report()
 	if(!scanning)
+		scanning = TRUE
 		usr.visible_message("<span class='warning'>[src] rattles and prints out a sheet of paper.</span>")
 		playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 		sleep(50)
@@ -437,7 +440,6 @@ REAGENT SCANNER
 			M.put_in_hands(P)
 			to_chat(M, "<span class='notice'>Report printed. Log cleared.<span>")
 			datatoprint = ""
-			scanning = 1
 	else
 		to_chat(usr, "<span class='notice'>[src] has no logs or is already in use.</span>")
 

code/game/objects/items/mountable_frames/apc_frame.dm

@@ -10,11 +10,11 @@
 		var/turf/turf_loc = get_turf(user)
 		var/area/area_loc = turf_loc.loc
 		if(area_loc.get_apc())
-			to_chat(user, "<span class='rose'>This area already has an APC.</span>")
+			to_chat(user, "<span class='warning'>This area already has an APC.</span>")
 			return //only one APC per area
 		for(var/obj/machinery/power/terminal/T in turf_loc)
 			if(T.master)
-				to_chat(user, "<span class='rose'>There is another network terminal here.</span>")
+				to_chat(user, "<span class='warning'>There is another network terminal here.</span>")
 				return
 			else
 				var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc)

code/game/objects/items/mountable_frames/frames.dm

@@ -20,11 +20,11 @@
 		var/turf/turf_loc = get_turf(user)
 
 		if(src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor))
-			to_chat(user, "<span class='rose'>[src] cannot be placed on this spot.</span>")
+			to_chat(user, "<span class='warning'>[src] cannot be placed on this spot.</span>")
 			return
 		if(src.mount_reqs.Find("nospace"))
 			var/area/my_area = turf_loc.loc
 			if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space)))
-				to_chat(user, "<span class='rose'>[src] cannot be placed in this area.</span>")
+				to_chat(user, "<span class='warning'>[src] cannot be placed in this area.</span>")
 				return
 		return 1

code/game/objects/items/mountable_frames/mountables.dm

@@ -21,11 +21,11 @@
 	if(proximity_flag != 1) //if we aren't next to the wall
 		return
 	if(!( get_dir(on_wall,user) in cardinal))
-		to_chat(user, "<span class='rose'>You need to be standing next to a wall to place \the [src].</span>")
+		to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
 		return
 
 	if(gotwallitem(get_turf(user), get_dir(on_wall,user)))
-		to_chat(user, "<span class='rose'>There's already an item on this wall!</span>")
+		to_chat(user, "<span class='warning'>There's already an item on this wall!</span>")
 		return
 
 	return 1

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

@@ -62,14 +62,7 @@
 	else
 		if(world.time >= next_sound)		//This cooldown doesn't prevent us from releasing bees, just stops the sound
 			next_sound = world.time + 90
-			//Play sound through the station intercomms, so everyone knows the doom you have wrought.
-			for(var/O in global_intercoms)
-				var/obj/item/device/radio/intercom/I = O
-				if(!is_station_level(I.z))	//Only broadcast to the station intercoms
-					continue
-				if(!I.on)					//Only broadcast to active intercoms (powered, switched on)
-					continue
-				playsound(I, sound_file, 35)
+			playsound(loc, sound_file, 35)
 
 		//Release up to 5 bees per use. Without using strange reagent, that means two uses. WITH strange reagent, you can get more if you don't release the last bee
 		for(var/bee = min(5, bees_left), bee > 0, bee--)

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

@@ -568,7 +568,8 @@
 	if(!target.mind)	//no mind means no conversion, but also means no faith lost.
 		to_chat(missionary, "<span class='warning'>You halt the conversion as you realize [target] is mindless! Best to save your faith for someone more worthwhile.</span>")
 		return
-	if(do_after(missionary, 40))	//4 seconds to temporarily convert, roughly 1 second faster than a vampire's enthrall ability
+	to_chat(target, "<span class='userdanger'>Your mind seems foggy. For a moment, all you can think about is serving the greater good... the greater good...</span>")
+	if(do_after(missionary, 80))	//8 seconds to temporarily convert, roughly 3 seconds slower than a vamp's enthrall, but its a ranged thing
 		if(faith < 100)		//to stop people from trying to exploit the do_after system to multi-convert, we check again if you have enough faith when it completes
 			to_chat(missionary, "<span class='warning'>You don't have enough faith to complete the conversion on [target]!</span>")
 			return
@@ -589,14 +590,9 @@
 		faith -= 25		//same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
 		return
 	if(ismindshielded(target))
-		if(prob(20))	//loyalty implants typically overpower this, but you CAN get lucky and convert still (20% chance of success)
-			faith -= 125	//yes, this puts it negative. it's gonna take longer to recharge if you manage to convert a one of these people to balance the new power you gained through them
-			to_chat(missionary, "<span class='notice'>Through sheer willpower, you overcome their closed mind and rally [target] to your cause! You may need a bit longer than usual before your faith is fully recharged, and they won't remain loyal to you for long ...</span>")
-			convert_duration = 3000		//5 min, because the loyalty implant will attempt to counteract the subversion
-		else	//80% chance to fail
-			faith -= 75
-			to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.</span>")
-			return
+		faith -= 75
+		to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.</span>")
+		return
 	else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian")		//fancy book lernin helps counter religion (day 0 job love, what madness!)
 		if(prob(35))	//35% chance to fail
 			to_chat(missionary, "<span class='warning'>This one is well trained in matters of the mind... They will not be swayed as easily as you thought...</span>")

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

@@ -18,6 +18,8 @@
 /obj/item/weapon/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity)
 	if(!proximity)
 		return
+	if(!is_open_container())
+		return
 	if(istype(target) && reagents.total_volume >= 5)
 		user.visible_message("<span class='warning'>[target] has been splashed with something by [user]!</span>")
 		spawn(5)