Merge pull request #12577 from GhostActual/tg-port-3

The Grand /TG Port - Part 3

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

@@ -8,10 +8,10 @@
 	w_class = ITEMSIZE_HUGE
 	layer = UNDER_JUNK_LAYER
 	blocks_emissive = EMISSIVE_BLOCK_GENERIC
-	
+
 	var/opened = 0
 	var/sealed = 0
-	
+
 	var/seal_tool = /obj/item/weapon/weldingtool	//Tool used to seal the closet, defaults to welder
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
@@ -24,8 +24,8 @@
 							  //then open it in a populated area to crash clients.
 	var/storage_cost = 40	//How much space this closet takes up if it's stuffed in another closet
 
-	var/open_sound = 'sound/machines/click.ogg'
-	var/close_sound = 'sound/machines/click.ogg'
+	var/open_sound = 'sound/effects/closet_open.ogg'
+	var/close_sound = 'sound/effects/closet_close.ogg'
 
 	var/store_misc = 1		//Chameleon item check
 	var/store_items = 1		//Will the closet store items?
@@ -141,7 +141,7 @@
 	dump_contents()
 
 	opened = 1
-	playsound(src, open_sound, 15, 1, -3)
+	playsound(src, open_sound, 50, 1, -3)
 	if(initial(density))
 		density = !density
 	animate_door()
@@ -166,7 +166,7 @@
 
 	opened = 0
 
-	playsound(src, close_sound, 15, 1, -3)
+	playsound(src, close_sound, 50, 1, -3)
 	if(initial(density))
 		density = !density
 	animate_door(TRUE)

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

@@ -2,7 +2,7 @@
 	name = "coffin"
 	desc = "It's a burial receptacle for the dearly departed."
 	icon = 'icons/obj/closets/coffin.dmi'
-	
+
 	icon_state = "closed_unlocked"
 	seal_tool = /obj/item/weapon/tool/screwdriver
 	breakout_sound = 'sound/weapons/tablehit1.ogg'
@@ -20,6 +20,8 @@
 	max_closets = 1
 	opened = 1
 	closet_appearance = null // Special icon for us
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
 
 /obj/structure/closet/grave/attack_hand(mob/user as mob)
 	if(opened)

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

@@ -4,6 +4,9 @@
 	icon = 'icons/obj/closets/bases/cabinet.dmi'
 	closet_appearance = /decl/closet_appearance/cabinet
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 /obj/structure/closet/acloset
 	name = "strange closet"
 	desc = "It looks alien!"

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

@@ -243,6 +243,8 @@
 	desc = "It's wall-mounted storage unit for an AutoLok suit."
 	icon = 'icons/obj/closets/bases/wall_double.dmi'
 	closet_appearance = /decl/closet_appearance/wall_double/autolok
+	open_sound = 'sound/machines/click.ogg'
+	close_sound = 'sound/machines/click.ogg'
 	anchored = TRUE
 	density = FALSE
 	wall_mounted = 1
@@ -262,6 +264,8 @@
 	desc = "It's wall-mounted storage unit for an emergency suit."
 	icon = 'icons/obj/closets/bases/wall.dmi'
 	closet_appearance = /decl/closet_appearance/wall/emergency
+	open_sound = 'sound/machines/click.ogg'
+	close_sound = 'sound/machines/click.ogg'
 	anchored = TRUE
 	density = FALSE
 	wall_mounted = 1

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

@@ -8,6 +8,9 @@
 		/obj/item/weapon/reagent_containers/food/condiment/spacespice = 2
 		)
 
+	open_sound = 'sound/machines/click.ogg'
+	close_sound = 'sound/machines/click.ogg'
+
 /obj/structure/closet/secure_closet/freezer/kitchen/mining
 	req_access = list()
 

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

@@ -210,6 +210,9 @@
 	req_access = list(access_psychiatrist)
 	closet_appearance = /decl/closet_appearance/cabinet/secure
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 	starts_with = list(
 		/obj/item/clothing/under/rank/psych,
 		/obj/item/clothing/under/rank/psych/turtleneck,

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

@@ -31,6 +31,9 @@
 /obj/structure/closet/secure_closet/personal/cabinet
 	closet_appearance = /decl/closet_appearance/cabinet/secure
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/satchel/withwallet,
 		/obj/item/device/radio/headset

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

@@ -238,6 +238,9 @@
 	req_access = list(access_forensics_lockers)
 	closet_appearance = /decl/closet_appearance/cabinet/secure
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 	starts_with = list(
 		/obj/item/clothing/accessory/badge/holo/detective,
 		/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves

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

@@ -11,6 +11,9 @@
 	store_mobs = 0
 	wall_mounted = 1
 
+	open_sound = 'sound/machines/click.ogg'
+	close_sound = 'sound/machines/click.ogg'
+
 //spawns 2 sets of breathmask, emergency oxy tank and crowbar
 
 /obj/structure/closet/walllocker/emerglocker
@@ -92,6 +95,9 @@
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 
+	open_sound = 'sound/machines/click.ogg'
+	close_sound = 'sound/machines/click.ogg'
+
 /obj/structure/closet/walllocker_double/north
 	pixel_y = 32
 	dir = SOUTH

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

@@ -41,6 +41,9 @@
 	name = "detective wardrobe"
 	closet_appearance = /decl/closet_appearance/cabinet
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 	starts_with = list(
 		/obj/item/clothing/head/det = 2,
 		/obj/item/clothing/head/det/grey = 2,
@@ -460,6 +463,9 @@
 	name = "site manager's wardrobe"
 	closet_appearance = /decl/closet_appearance/cabinet
 
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/captain,
 		/obj/item/clothing/suit/captunic,

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

@@ -10,6 +10,9 @@
 	var/points_per_crate = 5
 	var/rigged = 0
 
+	open_sound = 'sound/effects/crate_open.ogg'
+	close_sound = 'sound/effects/crate_close.ogg'
+
 /obj/structure/closet/crate/can_open()
 	return 1
 
@@ -32,7 +35,7 @@
 				if(usr.stunned)
 					return 2
 
-	playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
+	playsound(src, open_sound, 50, 1, -3)
 	for(var/obj/O in src)
 		O.forceMove(get_turf(src))
 	src.opened = 1
@@ -48,7 +51,7 @@
 	if(!src.can_close())
 		return 0
 
-	playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
+	playsound(src, close_sound, 50, 1, -3)
 	var/itemcount = 0
 	for(var/obj/O in get_turf(src))
 		if(itemcount >= storage_capacity)
@@ -698,3 +701,30 @@
 	starts_with = list(
 		/obj/item/weapon/reagent_containers/spray/plantbgone = 2,
 		/obj/item/weapon/material/minihoe)
+
+//Laundry Cart
+/obj/structure/closet/crate/laundry
+	name = "Laundry Cart"
+	desc = "A cart with a large fabric bin on it used for transporting large amounts of clothes."
+	icon = 'icons/obj/closets/laundry.dmi'
+	closet_appearance = null
+	open_sound = 'sound/effects/rustle1.ogg'
+	close_sound = 'sound/effects/rustle2.ogg'
+
+//Wooden Crate
+/obj/structure/closet/crate/wooden
+	name = "wooden crate"
+	desc = "A crate made from wood and lined with straw. Cheapest form of storage."
+	icon = 'icons/obj/closets/wooden.dmi'
+	closet_appearance = null
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'
+
+//Mining Cart
+/obj/structure/closet/crate/miningcar
+	name = "mining cart"
+	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
+	icon = 'icons/obj/closets/miningcar.dmi'
+	closet_appearance = null
+	open_sound = 'sound/effects/wooden_closet_open.ogg'
+	close_sound = 'sound/effects/wooden_closet_close.ogg'