(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	code/game/machinery/atmoalter/canister.dm

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

@@ -381,6 +381,10 @@
 	new /obj/item/clothing/head/soft/grey(src)
 	if(prob(50))
 		new /obj/item/weapon/storage/backpack/duffel(src)
+	if(prob(40))
+		new /obj/item/clothing/under/assistantformal(src)
+	if(prob(40))
+		new /obj/item/clothing/under/assistantformal(src)
 	return
 
 

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

@@ -6,6 +6,7 @@
 	icon_closed = "critter"
 	var/already_opened = 0
 	var/content_mob = null
+	var/amount = 1
 
 /obj/structure/closet/critter/can_open()
 	if(welded)
@@ -21,19 +22,7 @@
 		return ..()
 
 	if(content_mob != null && already_opened == 0)
-		if(content_mob == /mob/living/simple_animal/chick)
-			var/num = rand(4, 6)
-			for(var/i = 0, i < num, i++)
-				new content_mob(loc)
-		else if(content_mob == /mob/living/simple_animal/corgi)
-			var/num = rand(0, 1)
-			if(num) //No more matriarchy for cargo
-				content_mob = /mob/living/simple_animal/corgi/Lisa
-			new content_mob(loc)
-		else if(content_mob == /mob/living/simple_animal/cat)
-			if(prob(50))
-				content_mob = /mob/living/simple_animal/cat/Proc
-		else
+		for(var/i = 1, i <= amount, i++)
 			new content_mob(loc)
 		already_opened = 1
 	..()
@@ -53,7 +42,12 @@
 
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
-	content_mob = /mob/living/simple_animal/corgi //This statement is (not) false. See above.
+	content_mob = /mob/living/simple_animal/corgi
+
+/obj/structure/closet/critter/corgi/New()
+	if(prob(50))
+		content_mob = /mob/living/simple_animal/corgi/Lisa
+	..()
 
 /obj/structure/closet/critter/cow
 	name = "cow crate"
@@ -67,10 +61,28 @@
 	name = "chicken crate"
 	content_mob = /mob/living/simple_animal/chick
 
+/obj/structure/closet/critter/chick/New()
+	amount = rand(1, 3)
+	..()
+
 /obj/structure/closet/critter/cat
 	name = "cat crate"
 	content_mob = /mob/living/simple_animal/cat
 
+/obj/structure/closet/critter/cat/New()
+	if(prob(50))
+		content_mob = /mob/living/simple_animal/cat/Proc
+	..()
+
+/obj/structure/closet/critter/pug
+	name = "pug crate"
+	content_mob = /mob/living/simple_animal/pug
+
 /obj/structure/closet/critter/fox
 	name = "fox crate"
-	content_mob = /mob/living/simple_animal/fox
+	content_mob = /mob/living/simple_animal/fox
+
+/obj/structure/closet/critter/butterfly
+	name = "butterflies crate"
+	content_mob = /mob/living/simple_animal/butterfly
+	amount = 50

code/game/objects/structures/dresser.dm

@@ -6,6 +6,15 @@
 	density = 1
 	anchored = 1
 
+/obj/structure/dresser/proc/convUnM(mund)
+	return underwear_m.Find(mund)
+
+/obj/structure/dresser/proc/convUnF(fund)
+	return underwear_f.Find(fund)
+
+/obj/structure/dresser/proc/convUs(us)
+	return undershirt_list.Find(us)
+
 /obj/structure/dresser/attack_hand(mob/user as mob)
 	if(!Adjacent(user))//no tele-grooming
 		return
@@ -18,14 +27,26 @@
 			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
+				if(H.gender == FEMALE)
+					var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_f
+					if(new_undies)
+						H << "\red You selected [new_undies]."
+						var/freturn = convUnF(new_undies)
+						H.underwear = freturn
+
+				else
+					var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in underwear_m
+					if(new_undies)
+						H << "\red You selected [new_undies]."
+						var/mreturn = convUnM(new_undies)
+						H.underwear = mreturn
 
 			if("Undershirt")
 				var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in undershirt_list
 				if(new_undershirt)
-					H.undershirt = new_undershirt
+					H << "\red You selected [new_undershirt]"
+					var/usreturn = convUs(new_undershirt)
+					H.undershirt = usreturn
 
 		add_fingerprint(H)
 		H.update_body()