From 1d3e58a5a9e2064aea093a2870fe9a8cd964df88 Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Sun, 16 Oct 2022 17:02:06 -0400
Subject: [PATCH] Merge pull request #13895 from KillianKirilenko/kk-randomsoap

Random-Soap Addon
---
 code/defines/obj/weapon.dm       | 11 ++++-----
 code/game/objects/random/misc.dm | 38 ++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 767268dc7f..116a17c67e 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -39,6 +39,12 @@
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
+	var/randomize = TRUE
+	var/square_chance = 10
+	
+/obj/item/weapon/soap/Initialize()
+	if(randomize && prob(square_chance))
+		icon_state = "[icon_state]-alt"
 
 /obj/item/weapon/soap/nanotrasen
 	desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick."
@@ -55,10 +61,6 @@
 	desc = "An untrustworthy bar of soap. Smells of fear."
 	icon_state = "soapsyndie"
 
-/obj/item/weapon/soap/syndie
-	desc = "An dubious bar of soap. Smells of lyes."
-	icon_state = "soapsyndie"
-
 /obj/item/weapon/soap/space_soap
 	desc = "Smells like hot metal and walnuts."
 	icon_state = "space_soap"
@@ -135,7 +137,6 @@
 	desc = "Smells like honey."
 	icon_state = "golden_soap"
 
-
 /obj/item/weapon/bikehorn
 	name = "bike horn"
 	desc = "A horn off of a bicycle."
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index f6f1e3c5f0..934d119d77 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -245,6 +245,7 @@
 	desc = "Hot Stuff."
 	icon_state = "sus"
 	spawn_nothing_percentage = 50
+
 /obj/random/contraband/item_to_spawn()
 	return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit,
 				prob(4);/obj/item/weapon/storage/pill_bottle/happy,
@@ -307,10 +308,10 @@
 				prob(5);/obj/item/weapon/spacecash/c1000)
 
 /obj/random/soap
-	name = "Random Soap"
-	desc = "This is a random bar of soap."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "soap"
+	name = "Random Soap (All)"
+	desc = "This is a random bar of soap. Includes special types."
+	icon = 'icons/obj/soap.dmi'
+	icon_state = "rainbow_soap"
 
 /obj/random/soap/item_to_spawn()
 	return pick(/obj/item/weapon/soap,
@@ -338,6 +339,35 @@
 				/obj/item/weapon/soap/red_soap,
 				/obj/item/weapon/soap/golden_soap)
 
+/obj/random/soap_common
+	name = "Random Soap (Common)"
+	desc = "This is a random bar of soap. Only has the basic types; no NT, deluxe, or syndisoap."
+	icon = 'icons/obj/soap.dmi'
+	icon_state = "rainbow_soap"
+
+/obj/random/soap_common/item_to_spawn()
+	return pick(/obj/item/weapon/soap,
+				/obj/item/weapon/soap/space_soap,
+				/obj/item/weapon/soap/space_soap,
+				/obj/item/weapon/soap/water_soap,
+				/obj/item/weapon/soap/fire_soap,
+				/obj/item/weapon/soap/rainbow_soap,
+				/obj/item/weapon/soap/diamond_soap,
+				/obj/item/weapon/soap/uranium_soap,
+				/obj/item/weapon/soap/silver_soap,
+				/obj/item/weapon/soap/brown_soap,
+				/obj/item/weapon/soap/white_soap,
+				/obj/item/weapon/soap/grey_soap,
+				/obj/item/weapon/soap/pink_soap,
+				/obj/item/weapon/soap/purple_soap,
+				/obj/item/weapon/soap/blue_soap,
+				/obj/item/weapon/soap/cyan_soap,
+				/obj/item/weapon/soap/green_soap,
+				/obj/item/weapon/soap/yellow_soap,
+				/obj/item/weapon/soap/orange_soap,
+				/obj/item/weapon/soap/red_soap,
+				/obj/item/weapon/soap/golden_soap)
+
 /obj/random/drinkbottle
 	name = "random drink"
 	desc = "This is a random drink."