From 484c2e05459f679870f851dff886c4e9f4b2bb7d Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Mon, 3 Oct 2022 11:38:57 +0100 Subject: [PATCH] more soap, better soap --- code/defines/obj/weapon.dm | 88 ++++++++++++++++++++++++++++--- code/game/objects/random/misc.dm | 28 ++++++++-- icons/obj/soap.dmi | Bin 0 -> 10935 bytes 3 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 icons/obj/soap.dmi diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6e7f0f649e..f1aad991fd 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -29,9 +29,9 @@ /obj/item/soap name = "soap" - desc = "A cheap bar of soap. Doesn't smell." + desc = "A cheap bar of soap. Smells of lye." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/soap.dmi' icon_state = "soap" flags = NOCONDUCT w_class = ITEMSIZE_SMALL @@ -41,20 +41,96 @@ throw_range = 20 /obj/item/soap/nanotrasen - desc = "A NanoTrasen-brand bar of soap. Smells of phoron." + desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick." icon_state = "soapnt" /obj/item/soap/deluxe icon_state = "soapdeluxe" /obj/item/soap/deluxe/Initialize() - desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]." + desc = "A deluxe NanoLux brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]." . = ..() /obj/item/soap/syndie - desc = "An untrustworthy bar of soap. Smells of fear." + desc = "An dubious bar of soap. Smells of lyes." icon_state = "soapsyndie" +/obj/item/soap/space_soap + desc = "Smells like hot metal and walnuts." + icon_state = "space_soap" + +/obj/item/soap/water_soap + desc = "Smells like chlorine." + icon_state = "water_soap" + +/obj/item/soap/fire_soap + desc = "Smells like a campfire." + icon_state = "fire_soap" + +/obj/item/soap/rainbow_soap + desc = "Smells sickly sweet." + icon_state = "rainbow_soap" + +/obj/item/soap/diamond_soap + desc = "Smells like saffron and vanilla." + icon_state = "diamond_soap" + +/obj/item/soap/uranium_soap + desc = "Smells not great... Not terrible." + icon_state = "uranium_soap" + +/obj/item/soap/silver_soap + desc = "Smells like birch and amaranth." + icon_state = "silver_soap" + +/obj/item/soap/brown_soap + desc = "Smells like cinnamon and cognac." + icon_state = "brown_soap" + +/obj/item/soap/white_soap + desc = "Smells like nutmeg and oats." + icon_state = "white_soap" + +/obj/item/soap/grey_soap + desc = "Smells like bergamot and lilies." + icon_state = "grey_soap" + +/obj/item/soap/pink_soap + desc = "Smells like bubblegum." + icon_state = "pink_soap" + +/obj/item/soap/purple_soap + desc = "Smells like lavender." + icon_state = "purple_soap" + +/obj/item/soap/blue_soap + desc = "Smells like cardamom." + icon_state = "blue_soap" + +/obj/item/soap/cyan_soap + desc = "Smells like bluebells and peaches." + icon_state = "cyan_soap" + +/obj/item/soap/green_soap + desc = "Smells like a freshly mowed lawn." + icon_state = "green_soap" + +/obj/item/soap/yellow_soap + desc = "Smells like citron and ginger." + icon_state = "yellow_soap" + +/obj/item/soap/orange_soap + desc = "Smells like oranges and dark chocolate." + icon_state = "orange_soap" + +/obj/item/soap/red_soap + desc = "Smells like cherries." + icon_state = "red_soap" + +/obj/item/soap/golden_soap + desc = "Smells like honey." + icon_state = "golden_soap" + /obj/item/bikehorn name = "bike horn" desc = "A horn off of a bicycle." @@ -354,7 +430,7 @@ if(B.rped_rating() > lowest_rating) continue remove_from_storage(B, T) - + /obj/item/stock_parts name = "stock part" desc = "What?" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 82eaa3de05..42ca69373b 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -309,10 +309,30 @@ icon_state = "soap" /obj/random/soap/item_to_spawn() - return pick(prob(3);/obj/item/soap, - prob(2);/obj/item/soap/nanotrasen, - prob(2);/obj/item/soap/deluxe, - prob(1);/obj/item/soap/syndie) + return pick(/obj/item/soap, + /obj/item/soap/nanotrasen, + /obj/item/soap/deluxe, + /obj/item/soap/syndie, + /obj/item/soap/space_soap, + /obj/item/soap/space_soap, + /obj/item/soap/water_soap, + /obj/item/soap/fire_soap, + /obj/item/soap/rainbow_soap, + /obj/item/soap/diamond_soap, + /obj/item/soap/uranium_soap, + /obj/item/soap/silver_soap, + /obj/item/soap/brown_soap, + /obj/item/soap/white_soap, + /obj/item/soap/grey_soap, + /obj/item/soap/pink_soap, + /obj/item/soap/purple_soap, + /obj/item/soap/blue_soap, + /obj/item/soap/cyan_soap, + /obj/item/soap/green_soap, + /obj/item/soap/yellow_soap, + /obj/item/soap/orange_soap, + /obj/item/soap/red_soap, + /obj/item/soap/golden_soap) /obj/random/drinkbottle name = "random drink" diff --git a/icons/obj/soap.dmi b/icons/obj/soap.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e610eb2490587bbcf5a490ec376a75a89c22a8d1 GIT binary patch literal 10935 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