Merge branch 'master' into lightTweak

code/game/objects/effects/decals/contraband.dm

@@ -12,6 +12,7 @@
 	name = "rolled-up poster"
 	desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface."
 	icon_state = "rolled_poster"
+	drop_sound = 'sound/items/drop/wrapper.ogg'
 	var/serial_number = 0
 
 
@@ -60,7 +61,7 @@
 	var/obj/structure/sign/poster/P = new(user.loc, get_dir(user, W), serial_number)
 
 	flick("poster_being_set", P)
-	//playsound(W, 'sound/items/poster_being_created.ogg', 100, 1) //why the hell does placing a poster make printer sounds?
+	playsound(W, 'sound/items/package_wrap.ogg', 100, 1)
 
 	addtimer(CALLBACK(src, .proc/place_on_wall, P, user, W), 28, TIMER_CLIENT_TIME)
 
@@ -84,7 +85,7 @@
 	anchored = 1
 	var/serial_number	//Will hold the value of src.loc if nobody initialises it
 	var/poster_type		//So mappers can specify a desired poster
-	var/ruined = 0
+	var/ruined = FALSE
 
 /obj/structure/sign/poster/Initialize(mapload, placement_dir = null, serial = null)
 	. = ..()
@@ -136,18 +137,17 @@
 
 
 /obj/structure/sign/poster/attack_hand(mob/user as mob)
-
 	if(ruined)
 		return
-
+	if(user.a_intent == I_HELP)
+		user.examinate(src)
+		return
 	if(alert("Do I want to rip the poster from the wall?","You think...","Yes","No") == "Yes")
-
 		if(ruined || !user.Adjacent(src))
 			return
-
 		visible_message("<span class='warning'>\The [user] rips \the [src] in a single, decisive motion!</span>" )
 		playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
-		ruined = 1
+		ruined = TRUE
 		icon_state = "poster_ripped"
 		name = "ripped poster"
 		desc = "You can't make out anything from the poster's original print. It's ruined."

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

@@ -978,7 +978,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/remove_pen(mob/user)
 	if (!istype(user))
-		PROCLOG_WEIRD("user variable was insane, aborting!")
 		return
 	if (!has_pen)
 		to_chat(user, "<span class='notice'>[src] does not have a pen slot.</span>")

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

@@ -213,7 +213,7 @@ BREATH ANALYZER
 			user.show_message(text("<span class='warning'>Internal bleeding detected. Advanced scanner required for location.</span>"), 1)
 		if(M:vessel)
 			var/blood_volume = round(M:vessel.get_reagent_amount("blood"))
-			var/blood_percent =  blood_volume / 560
+			var/blood_percent = blood_volume / 560
 			var/blood_type = M.dna.b_type
 			blood_percent *= 100
 			if(blood_volume <= 500 && blood_volume > 336)

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

@@ -26,8 +26,8 @@
 		use_message = capitalize(copytext(sanitize(new_message), 1, MAX_MESSAGE_LEN))
 
 	to_chat(usr, "You configure the hailer to shout \"[use_message]\".")
-/
-obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
+
+/obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
 	if (spamcheck)
 		return
 

code/game/objects/items/stacks/stack.dm

@@ -89,7 +89,7 @@
 		if (istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
 			var/max_multiplier = round(src.get_amount() / R.req_amount)
-			var/title as text
+			var/title
 			var/can_build = 1
 			can_build = can_build && (max_multiplier>0)
 			if (R.res_amount>1)

code/game/objects/items/trash.dm

@@ -55,6 +55,9 @@
 	name = "plate"
 	icon_state = "plate"
 
+/obj/item/trash/plate/steak
+	icon_state = "steak"
+
 /obj/item/trash/snack_bowl
 	name = "snack bowl"
 	icon_state	= "snack_bowl"
@@ -76,6 +79,7 @@
 	name = "candle"
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle4"
+	drop_sound = 'sound/items/drop/gloves.ogg'
 
 /obj/item/trash/liquidfood
 	name = "\improper \"LiquidFood\" ration"

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

@@ -4,13 +4,14 @@
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle1"
 	item_state = "candle1"
+	drop_sound = 'sound/items/drop/gloves.ogg'
 	w_class = 1
 	light_color = "#E09D37"
 	var/wax = 2000
 
-/obj/item/weapon/flame/candle/New()
+/obj/item/weapon/flame/candle/Initialize()
+	. = ..()
 	wax = rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
-	..()
 
 /obj/item/weapon/flame/candle/update_icon()
 	var/i
@@ -27,33 +28,37 @@
 	if(W.iswelder())
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-			light("<span class='notice'>\The [user] casually lights the [name] with [W].</span>")
+			light()
+			to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W]."))
 	else if(isflamesource(W))
 		light()
+		to_chat(user, span("notice", "\The [user] lights \the [name]."))
 	else if(istype(W, /obj/item/weapon/flame/candle))
 		var/obj/item/weapon/flame/candle/C = W
 		if(C.lit)
 			light()
+			to_chat(user, span("notice", "\The [user] lights \the [name]."))
 
-
-/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "<span class='notice'>\The [usr] lights the [name].</span>")
+/obj/item/weapon/flame/candle/proc/light()
 	if(!src.lit)
 		src.lit = 1
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
 		//src.damtype = "fire"
-		for(var/mob/O in viewers(usr, null))
-			O.show_message(flavor_text, 1)
 		set_light(CANDLE_LUM)
+		update_icon()
 		START_PROCESSING(SSprocessing, src)
 
-/obj/item/weapon/flame/candle/process()
+/obj/item/weapon/flame/candle/process(mob/user)
 	if(!lit)
 		return
+	update_icon()
 	wax--
 	if(!wax)
-		new/obj/item/trash/candle(src.loc)
+		new /obj/item/trash/candle(src.loc)
 		if(istype(src.loc, /mob))
 			src.dropped()
-
+		to_chat(user, span("notice", "The candle burns out."))
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 		STOP_PROCESSING(SSprocessing, src)
 		qdel(src)
 	update_icon()
@@ -64,5 +69,7 @@
 /obj/item/weapon/flame/candle/attack_self(mob/user as mob)
 	if(lit)
 		lit = 0
+		to_chat(user, span("notice", "You snuff out the flame."))
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 		update_icon()
-		set_light(0)
+		set_light(0)

code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm

@@ -117,7 +117,7 @@
 	board_type = "machine"
 	req_components = list(
 							"/obj/item/weapon/stock_parts/capacitor" = 3,
-							"/obj/item/weapon/stock_parts/scanning_module" = 1,
+							"/obj/item/weapon/stock_parts/micro_laser" = 1,
 							"/obj/item/weapon/stock_parts/matter_bin" = 2)
 
 /obj/item/weapon/circuitboard/oven

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -32,7 +32,7 @@
 			S.icon_state = "shield0"
 
 	to_chat(M, "<span class='danger'>BANG</span>")
-	playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 5, 0.9, 1)
+	playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 3, 0.5, 1)
 
 //Checking for protections
 	var/eye_safety = 0

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

@@ -13,12 +13,15 @@
  *		Cigarette Box
  */
 
-/obj/item/weapon/storage/fancy/
+/obj/item/weapon/storage/fancy
+	name = "donut box"
+	desc = "A box of half-a-dozen donuts."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "donutbox6"
-	name = "donut box"
 	var/icon_type = "donut"
 	var/storage_type = "box"
+	drop_sound = 'sound/items/drop/box.ogg'
+	use_sound = 'sound/items/storage/box.ogg'
 
 /obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0)
 	var/total_contents = src.contents.len - itemremoved
@@ -43,11 +46,12 @@
  */
 
 /obj/item/weapon/storage/fancy/egg_box
+	name = "egg box"
+	desc = "A carton of eggs."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "eggbox"
-	center_of_mass = list("x" = 16,"y" = 7)
 	icon_type = "egg"
-	name = "egg box"
+	center_of_mass = list("x" = 16,"y" = 7)
 	storage_slots = 12
 	can_hold = list(
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
@@ -79,8 +83,9 @@
 	desc = "A box of crayons for all your rune drawing needs."
 	icon = 'icons/obj/crayons.dmi'
 	icon_state = "crayonbox"
-	w_class = 2.0
 	icon_type = "crayon"
+	drop_sound = 'sound/items/drop/box.ogg'
+	w_class = 2.0
 	can_hold = list(
 		/obj/item/weapon/pen/crayon
 	)
@@ -123,6 +128,8 @@
 	icon = 'icons/obj/cigs_lighters.dmi'
 	icon_state = "cigpacket"
 	item_state = "cigpacket"
+	drop_sound = 'sound/items/drop/gloves.ogg'
+	use_sound = 'sound/items/drop/paper.ogg'
 	w_class = 1
 	throwforce = 2
 	slot_flags = SLOT_BELT
@@ -204,6 +211,8 @@
 	icon_state = "cigarcase"
 	item_state = "cigarcase"
 	icon = 'icons/obj/cigs_lighters.dmi'
+	drop_sound = 'sound/items/drop/gloves.ogg'
+	use_sound = 'sound/items/drop/paper.ogg'
 	w_class = 1
 	throwforce = 2
 	slot_flags = SLOT_BELT
@@ -251,10 +260,11 @@
  */
 
 /obj/item/weapon/storage/fancy/vials
+	name = "vial storage box"
 	icon = 'icons/obj/vialbox.dmi'
 	icon_state = "vialbox6"
 	icon_type = "vial"
-	name = "vial storage box"
+	drop_sound = 'sound/items/drop/metalboots.ogg'
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
 	starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/vial = 6)
@@ -265,6 +275,7 @@
 	icon = 'icons/obj/vialbox.dmi'
 	icon_state = "vialbox0"
 	item_state = "syringe_kit"
+	drop_sound = 'sound/items/drop/metalboots.ogg'
 	max_w_class = 2
 	can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
 	max_storage_space = 12 //The sum of the w_classes of all the items in this storage item.

code/game/objects/random/random.dm

@@ -691,7 +691,7 @@
 		/obj/item/clothing/head/kitty = 0.2,
 		/obj/item/clothing/head/pirate = 0.2,
 		/obj/item/clothing/head/plaguedoctorhat = 0.3,
-		/obj/item/clothing/head/pumpkinhead = 0.4,
+		/obj/item/clothing/head/pumpkin/lantern = 0.4,
 		/obj/item/clothing/head/redcoat = 0.2,
 		/obj/item/clothing/head/richard = 0.3,
 		/obj/item/clothing/head/soft/rainbow = 0.7,
@@ -715,6 +715,7 @@
 		/obj/item/clothing/mask/pig = 0.3,
 		/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 0.7,
 		/obj/item/clothing/mask/smokable/pipe/cobpipe = 0.5,
+		/obj/item/clothing/shoes/carp = 0.5,
 		/obj/item/clothing/shoes/clown_shoes = 0.1,
 		/obj/item/clothing/shoes/combat = 0.2,
 		/obj/item/clothing/shoes/cyborg = 0.4,
@@ -1081,6 +1082,7 @@
 		/obj/item/clothing/mask/fakemoustache			= 11,
 		/obj/item/clothing/mask/gas/clown_hat			= 11,
 		/obj/item/clothing/mask/gas/mime				= 11,
+		/obj/item/clothing/shoes/carp					= 9,
 		/obj/item/weapon/gun/energy/wand/toy			= 5,
 		/obj/item/device/binoculars						= 11,
 		/obj/item/device/megaphone						= 11,