Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

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

@@ -47,7 +47,6 @@
 
 	New()
 		..()
-		new /obj/item/weapon/book/manual/faxes(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/head/hopcap(src)
 		new /obj/item/weapon/cartridge/hop(src)
@@ -103,7 +102,6 @@
 			new /obj/item/weapon/storage/backpack/security(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
-		new /obj/item/weapon/book/manual/faxes(src)
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos/alt(src)
 		new /obj/item/clothing/under/rank/head_of_security(src)

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

@@ -25,21 +25,12 @@
 		for(var/i = 1, i <= amount, i++)
 			new content_mob(loc)
 		already_opened = 1
-	..()
+	. = ..()
 
 /obj/structure/closet/critter/close()
 	..()
 	return 1
 
-/obj/structure/closet/critter/attack_hand(mob/user as mob)
-	src.add_fingerprint(user)
-
-	if(src.loc == user.loc)
-		to_chat(user, "<span class='notice'>It won't budge!</span>")
-		toggle()
-	else
-		toggle()
-
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
 	content_mob = /mob/living/simple_animal/pet/corgi

code/game/objects/structures/dresser.dm

@@ -18,20 +18,37 @@
 			return
 		switch(choice)
 			if("Underwear")
-				var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_list
-				if(new_undies)
-					H.underwear = new_undies
+				var/list/valid_underwear = list()
+				for(var/underwear in underwear_list)
+					var/datum/sprite_accessory/S = underwear_list[underwear]
+					if(!(H.species.name in S.species_allowed))
+						continue
+					valid_underwear[underwear] = underwear_list[underwear]
+				var/new_underwear = input(user, "Choose your underwear:", "Changing") as null|anything in valid_underwear
+				if(new_underwear)
+					H.underwear = new_underwear
 
 			if("Undershirt")
-				var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in undershirt_list
+				var/list/valid_undershirts = list()
+				for(var/undershirt in undershirt_list)
+					var/datum/sprite_accessory/S = undershirt_list[undershirt]
+					if(!(H.species.name in S.species_allowed))
+						continue
+					valid_undershirts[undershirt] = undershirt_list[undershirt]
+				var/new_undershirt = input(user, "Choose your undershirt:", "Changing") as null|anything in valid_undershirts
 				if(new_undershirt)
 					H.undershirt = new_undershirt
 
 			if("Socks")
-				var/new_socks = input(user, "Select your socks", "Changing") as null|anything in socks_list
+				var/list/valid_sockstyles = list()
+				for(var/sockstyle in socks_list)
+					var/datum/sprite_accessory/S = socks_list[sockstyle]
+					if(!(H.species.name in S.species_allowed))
+						continue
+					valid_sockstyles[sockstyle] = socks_list[sockstyle]
+				var/new_socks = input(user, "Choose your socks:", "Changing")  as null|anything in valid_sockstyles
 				if(new_socks)
-					H.socks= new_socks
-
+					H.socks = new_socks
 
 		add_fingerprint(H)
 		H.update_body()

code/game/objects/structures/girders.dm

@@ -231,7 +231,6 @@
 	icon_state= "cultgirder"
 	anchored = 1
 	density = 1
-	layer = 2
 	var/health = 250
 
 /obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params)

code/game/objects/structures/mop_bucket.dm

@@ -8,9 +8,7 @@
 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
 
 /obj/structure/mopbucket/New()
-	var/datum/reagents/R = new/datum/reagents(100)
-	reagents = R
-	R.my_atom = src
+	create_reagents(100)
 	janitorial_equipment += src
 
 /obj/structure/mopbucket/full/New()

code/game/objects/structures/morgue.dm

@@ -12,7 +12,7 @@
 
 /obj/structure/morgue
 	name = "morgue"
-	desc = "Used to keep bodies in untill someone fetches them."
+	desc = "Used to keep bodies in until someone fetches them."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "morgue1"
 	density = 1

code/game/objects/structures/watercloset.dm

@@ -420,8 +420,7 @@
 			H.lip_style = null //Washes off lipstick
 			H.lip_color = initial(H.lip_color)
 			H.regenerate_icons()
-		user.drowsyness -= rand(2,3) //Washing your face wakes you up if you're falling asleep
-		user.drowsyness = Clamp(user.drowsyness, 0, INFINITY)
+		user.AdjustDrowsy(-rand(2,3)) //Washing your face wakes you up if you're falling asleep
 	else
 		user.clean_blood()
 
@@ -459,4 +458,3 @@
 	icon_state = "puddle-splash"
 	..()
 	icon_state = "puddle"
-