Merge remote-tracking branch 'upstream/master'

code/game/objects/effects/landmarks.dm

@@ -171,6 +171,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Geneticist"
 	icon_state = "Geneticist"
 
+/obj/effect/landmark/start/psychologist
+	name = "Psychologist"
+	icon_state = "Medical Doctor"
+
 /obj/effect/landmark/start/chief_medical_officer
 	name = "Chief Medical Officer"
 	icon_state = "Chief Medical Officer"

code/game/objects/items.dm

@@ -29,9 +29,19 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	obj_flags = NONE
 	var/item_flags = NONE
 
-	var/hitsound = null
-	var/usesound = null
-	var/throwhitsound = null
+
+	var/hitsound
+	var/usesound
+
+	var/mob_throw_hit_sound
+
+	///Sound uses when picking the item up (into your hands)
+	var/pickup_sound
+	///Sound uses when dropping the item, or when its thrown.
+	var/drop_sound
+	///Sound used when equipping the item into a valid slot
+	var/equip_sound
+
 	var/w_class = WEIGHT_CLASS_NORMAL
 	var/total_mass //Total mass in arbitrary pound-like values. If there's no balance reasons for an item to have otherwise, this var should be the item's weight in pounds.
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
@@ -372,7 +382,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 /obj/item/proc/talk_into(mob/M, input, channel, spans, datum/language/language)
 	return ITALICS | REDUCE_RANGE
 
-/obj/item/proc/dropped(mob/user)
+/obj/item/proc/dropped(mob/user, silent)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
@@ -380,6 +390,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		qdel(src)
 	item_flags &= ~IN_INVENTORY
 	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
+	if(!silent)
+		playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE)
 
 // called just as an item is picked up (loc is not yet changed)
 /obj/item/proc/pickup(mob/user)
@@ -423,6 +435,11 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			A.Grant(user)
 	item_flags |= IN_INVENTORY
 
+	if(equip_sound &&(slot_flags & slotdefine2slotbit(slot)))
+		playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
+	else if(slot == SLOT_HANDS)
+		playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
+
 //sometimes we only want to grant the item's action if it's equipped in a specific slot.
 /obj/item/proc/item_action_slot_check(slot, mob/user)
 	if(slot == SLOT_IN_BACKPACK || slot == SLOT_LEGCUFFED) //these aren't true slots, so avoid granting actions there
@@ -575,6 +592,21 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		var/itempush = 1
 		if(w_class < 4)
 			itempush = 0 //too light to push anything
+
+		if(istype(hit_atom, /mob/living)) //Living mobs handle hit sounds differently.
+			var/volume = get_volume_by_throwforce_and_or_w_class()
+			if (throwforce > 0)
+				if (mob_throw_hit_sound)
+					playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1)
+				else if(hitsound)
+					playsound(hit_atom, hitsound, volume, TRUE, -1)
+				else
+					playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1)
+			else
+				playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
+
+		else
+			playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE)
 		return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
 
 /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, messy_throw = TRUE)
@@ -846,7 +878,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			layer = initial(layer)
 			plane = initial(plane)
 			appearance_flags &= ~NO_CLIENT_COLOR
-			dropped(M)
+			dropped(M, FALSE)
 	return ..()
 
 /obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)

code/game/objects/items/cigs_lighters.dm

@@ -232,7 +232,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(lit)
 		user.visible_message("<span class='notice'>[user] calmly drops and treads on \the [src], putting it out instantly.</span>")
 		new type_butt(user.loc)
-		new /obj/effect/decal/cleanable/ash(user.loc)
 		qdel(src)
 	. = ..()
 

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

@@ -32,6 +32,9 @@
 	var/datum/integrated_io/selected_io = null  //functional for integrated circuits.
 	var/mode = 0
 
+	drop_sound = 'sound/items/handling/multitool_drop.ogg'
+	pickup_sound =  'sound/items/handling/multitool_pickup.ogg'
+
 /obj/item/multitool/examine(mob/user)
 	. = ..()
 	if(selected_io)

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

@@ -200,6 +200,7 @@
 	if(!language)
 		language = M.get_default_language()
 	INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
+	playsound(src, 'sound/voice/radioin.ogg', 25, 0)
 	return ITALICS | REDUCE_RANGE
 
 /obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -50,6 +50,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	//END OF CIT CHANGES
 	new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
 	null, \
+	//add this when I can find a way to make them easily constructible > new/datum/stack_recipe("sink", /obj/structure/sink, 2, one_per_turf = TRUE, on_floor = TRUE),
+	new/datum/stack_recipe("shower", /obj/machinery/shower/crafted, 2, one_per_turf = TRUE, on_floor = TRUE), \
+	null, \
 	new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	null, \
@@ -355,6 +358,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/cloth
 	grind_results = list(/datum/reagent/cellulose = 4)
 
+	drop_sound = 'sound/items/handling/cloth_drop.ogg'
+	pickup_sound =  'sound/items/handling/cloth_pickup.ogg'
+
 /obj/item/stack/sheet/cloth/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.cloth_recipes
 	return ..()
@@ -400,6 +406,11 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/durathread
 	grind_results = list(/datum/reagent/cellulose = 10)
 
+	drop_sound = 'sound/items/handling/cloth_drop.ogg'
+	pickup_sound =  'sound/items/handling/cloth_pickup.ogg'
+
+
+
 /obj/item/stack/sheet/durathread/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.durathread_recipes
 	return ..()

code/game/objects/items/storage/belt.dm

@@ -11,6 +11,9 @@
 	max_integrity = 300
 	var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
 	var/worn_overlays = FALSE //worn counterpart of the above.
+	equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
+	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
+	pickup_sound =  'sound/items/handling/toolbelt_pickup.ogg'
 
 /obj/item/storage/belt/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -888,6 +891,16 @@ obj/item/storage/belt/slut/ComponentInitialize()
 		final_block_chance = 0 //Too thin to block bullets
 	return ..()
 
+/obj/item/storage/belt/sabre/chloesabre
+	name = "Ornate Sheath"
+	desc = "An ornate and rather sinister looking sabre sheathe."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	fitting_swords = list(/obj/item/toy/sword/chloesabre, /obj/item/melee/sabre, /obj/item/melee/baton/stunsword)
+	starting_sword = /obj/item/toy/sword/chloesabre
+
 /obj/item/storage/belt/botany
 	name = "botanical belt"
 	desc = "A belt made for holding hydroponics supplies."

code/game/objects/items/storage/boxes.dm

@@ -35,6 +35,9 @@
 	var/illustration = "writing"
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //exploits ahoy
 
+	drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
+	pickup_sound =  'sound/items/handling/cardboardbox_pickup.ogg'
+
 /obj/item/storage/box/Initialize(mapload)
 	. = ..()
 	update_icon()
@@ -643,6 +646,8 @@
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
 	price = 2
+	drop_sound = 'sound/items/handling/matchbox_drop.ogg'
+	pickup_sound =  'sound/items/handling/matchbox_pickup.ogg'
 
 /obj/item/storage/box/matches/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/firstaid.dm

@@ -389,3 +389,28 @@
 	/obj/item/organ_storage
 	))
 
+//Psych Pillbottles
+
+/obj/item/storage/pill_bottle/happinesspsych
+	name = "happiness pill bottle"
+	desc = "Contains pills used as a last resort means to temporarily stabilize depression and anxiety. WARNING: side effects may include slurred speech, drooling, and severe addiction."
+
+/obj/item/storage/pill_bottle/happinesspsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/happinesspsych(src)
+
+/obj/item/storage/pill_bottle/lsdpsych
+	name = "mindbreaker toxin pill bottle"
+	desc = "!FOR THERAPEUTIC USE ONLY! Contains pills used to alleviate the symptoms of Reality Dissociation Syndrome."
+
+/obj/item/storage/pill_bottle/lsdpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/lsdpsych(src)
+
+/obj/item/storage/pill_bottle/paxpsych
+	name = "pacification pill"
+	desc = "Contains pills used to temporarily pacify patients that are deemed a harm to themselves or others."
+
+/obj/item/storage/pill_bottle/paxpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/paxpsych(src)

code/game/objects/items/storage/toolbox.dm

@@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	materials = list(MAT_METAL = 500)
 	attack_verb = list("robusted")
 	hitsound = 'sound/weapons/smash.ogg'
+	drop_sound = 'sound/items/handling/toolbox_drop.ogg'
+	pickup_sound =  'sound/items/handling/toolbox_pickup.ogg'
 	var/latches = "single_latch"
 	var/has_latches = TRUE
 	var/can_rubberify = TRUE

code/game/objects/items/tools/crowbar.dm

@@ -13,6 +13,9 @@
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=50)
 
+	drop_sound = 'sound/items/handling/crowbar_drop.ogg'
+	pickup_sound =  'sound/items/handling/crowbar_pickup.ogg'
+
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 	tool_behaviour = TOOL_CROWBAR
 	toolspeed = 1

code/game/objects/items/tools/screwdriver.dm

@@ -19,6 +19,8 @@
 	usesound = list('sound/items/screwdriver.ogg', 'sound/items/screwdriver2.ogg')
 	tool_behaviour = TOOL_SCREWDRIVER
 	toolspeed = 1
+	drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
+	pickup_sound =  'sound/items/handling/screwdriver_pickup.ogg'
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 	var/random_color = TRUE //if the screwdriver uses random coloring
 	var/static/list/screwdriver_colors = list(

code/game/objects/items/tools/weldingtool.dm

@@ -34,6 +34,9 @@
 	tool_behaviour = TOOL_WELDER
 	toolspeed = 1
 
+	drop_sound = 'sound/items/handling/weldingtool_drop.ogg'
+	pickup_sound =  'sound/items/handling/weldingtool_pickup.ogg'
+
 /obj/item/weldingtool/Initialize()
 	. = ..()
 	create_reagents(max_fuel)

code/game/objects/items/tools/wirecutters.dm

@@ -17,6 +17,9 @@
 	hitsound = 'sound/items/wirecutter.ogg'
 	usesound = 'sound/items/wirecutter.ogg'
 
+	drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
+	pickup_sound =  'sound/items/handling/wirecutter_pickup.ogg'
+
 	tool_behaviour = TOOL_WIRECUTTER
 	toolspeed = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)

code/game/objects/items/tools/wrench.dm

@@ -13,6 +13,9 @@
 	usesound = 'sound/items/ratchet.ogg'
 	materials = list(MAT_METAL=150)
 
+	drop_sound = 'sound/items/handling/wrench_drop.ogg'
+	pickup_sound =  'sound/items/handling/wrench_pickup.ogg'
+
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	tool_behaviour = TOOL_WRENCH
 	toolspeed = 1

code/game/objects/structures/crates_lockers/closets.dm

@@ -27,8 +27,8 @@
 	var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
 	var/cutting_tool = /obj/item/weldingtool
-	var/open_sound = 'sound/machines/click.ogg'
-	var/close_sound = 'sound/machines/click.ogg'
+	var/open_sound = 'sound/effects/locker_open.ogg'
+	var/close_sound = 'sound/effects/locker_close.ogg'
 	var/material_drop = /obj/item/stack/sheet/metal
 	var/material_drop_amount = 2
 	var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.

code/game/objects/structures/crates_lockers/closets/secure/psychology.dm

@@ -0,0 +1,17 @@
+/obj/structure/closet/secure_closet/psychology
+    name = "psychology locker"
+    req_access = list(ACCESS_PSYCH)
+    icon_state = "cabinet"
+
+/obj/structure/closet/secure_closet/psychology/PopulateContents()
+    ..()
+    new /obj/item/clothing/under/lawyer/blacksuit(src)
+    new /obj/item/clothing/under/lawyer/blacksuit/skirt(src)
+    new /obj/item/clothing/shoes/laceup(src)
+    new /obj/item/storage/backpack/medic(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/clipboard(src)
+    new /obj/item/clothing/suit/straight_jacket(src)
+    new /obj/item/clothing/ears/earmuffs(src)
+    new /obj/item/clothing/mask/muzzle(src)
+    new /obj/item/clothing/glasses/sunglasses/blindfold(src)

code/game/objects/structures/tables_racks.dm

@@ -727,3 +727,9 @@
 		qdel(src)
 	building = FALSE
 
+
+/obj/structure/rack/shelf
+	name = "shelving"
+	desc = "Some nice metal shelves."
+	icon = 'hyperstation/icons/obj/objects.dmi'
+	icon_state = "shelf"

code/game/objects/structures/watercloset.dm

@@ -219,8 +219,8 @@
 	var/watertemp = "normal"	//freezing, normal, or boiling
 	var/datum/looping_sound/showering/soundloop
 
-/*/obj/machinery/shower/crafted	//When created from sheets of metal
-	anchored = FALSE */	//Stop exploiting this ree
+/obj/machinery/shower/crafted	//When created from sheets of metal
+	anchored = FALSE
 
 /obj/machinery/shower/Initialize()
 	. = ..()
@@ -292,19 +292,43 @@
 	if (user.a_intent != INTENT_HELP)
 		return ..()
 
-	if (I.tool_behaviour == TOOL_WRENCH)
-		to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I]...</span>")
-		if(I.use_tool(src, user, 50))
-			switch(watertemp)
-				if("normal")
-					watertemp = "freezing"
-				if("freezing")
-					watertemp = "boiling"
-				if("boiling")
-					watertemp = "normal"
-			user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I] to [watertemp] temperature.</span>")
-			log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])")
-			add_hiddenprint(user)
+	switch (I.tool_behaviour)
+		if (TOOL_WRENCH)
+			if (!anchored)
+				user.visible_message("<span class='notice'>[user] starts to take apart [src]...</span>", "<span class='notice'>You start dismantling [src]...</span>")
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 20))
+					deconstruct(TRUE)
+			else
+				to_chat(user, "<span class='notice'>You begin to adjust the temperature valve with \the [I]...</span>")
+				if(I.use_tool(src, user, 50))
+					switch(watertemp)
+						if("normal")
+							watertemp = "freezing"
+						if("freezing")
+							watertemp = "boiling"
+						if("boiling")
+							watertemp = "normal"
+					user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I] to [watertemp] temperature.</span>")
+					log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])")
+					add_hiddenprint(user)
+
+		if (TOOL_SCREWDRIVER)
+			if (!anchored)
+				to_chat(user, "<span class='notice'>You begin screwing in [src] to the floor...</span>")
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 30))
+					user.visible_message("<span class='notice'>[user] connects [src] to the floor.</span>", "<span class='notice'>You connect [src] to the floor.</span>")
+					anchored = TRUE
+			else
+				to_chat(user, "<span class='notice'>You start to take out [src]'s screws...</span>")
+				on = FALSE
+				soundloop.stop()
+				update_icon()
+				I.play_tool_sound(src)
+				if(I.use_tool(src, user, 20))
+					user.visible_message("<span class='notice'>[user] disconnects [src] from the floor.</span>", "<span class='notice'>You disconnect [src] from the floor.</span>")
+					anchored = FALSE
 
 /obj/machinery/shower/examine()
 	. += ..()
@@ -468,7 +492,7 @@
 		return PROCESS_KILL
 
 /obj/machinery/shower/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/metal (loc, 3)
+	new /obj/item/stack/sheet/metal (loc, 2)
 	qdel(src)
 
 /obj/machinery/shower/proc/check_heat(mob/living/carbon/C)