diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index a9a1db0b37b..87dd36803df 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -189,6 +189,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/stack/sheet/mineral/wood/fifty = 1, /obj/item/beacon = 1, /obj/item/weaponcrafting/receiver = 1, + /obj/item/paper/fluff/stations/soap =1, //recipes count as crafting. ) = 8, list(//medical and chemicals diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index c0bb70677bc..3f431aa1b98 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -107,7 +107,7 @@ if("Mime") heirloom_type = /obj/item/reagent_containers/food/snacks/baguette if("Janitor") - heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket) + heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket, /obj/item/paper/fluff/stations/soap) if("Cook") heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat) if("Botanist") diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index cef876142a4..73204a43162 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -73,6 +73,19 @@ icon_state = "soapsyndie" cleanspeed = 5 //faster than mop so it is useful for traitors who want to clean crime scenes +/obj/item/soap/omega + name = "omega soap" + desc = "The most advanced soap known to mankind." + icon_state = "soapomega" + cleanspeed = 3 //Only the truest of mind soul and body get one of these + uses = 301 + +/obj/item/paper/fluff/stations/soap + name = "ancient janitorial poem" + desc = "An old paper that has passed many hands." + info = "The legend of the omega soap

Essence of potato. Juice, not grind.

A lizard's tail, turned into wine.

powder of monkey, to help the workload.

Some Krokodil, because meth would explode.

Nitric acid and Baldium, for organic dissolving.

A cup filled with Hooch, for sinful absolving

Some Bluespace Dust, for removal of stains.

A syringe full of Pump-up, it's security's bane.

Add a can of Space Cola, because we've been paid.

Heat as hot as you can, let the soap be your blade.

Ten units of each regent create a soap that could topple all others." + + /obj/item/soap/suicide_act(mob/user) user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!", forced="soap suicide") user.visible_message("[user] lifts [src] to [user.p_their()] mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index c81e9213b37..7270eff2ab7 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -87,6 +87,18 @@ for(var/i = 1, i <= created_volume, i++) new /obj/item/soap/homemade(location) +/datum/chemical_reaction/omegasoapification + name = "Omega Soap" + id = "omegasoap" + required_reagents = list(/datum/reagent/consumable/potato_juice = 10, /datum/reagent/consumable/ethanol/lizardwine = 10, /datum/reagent/monkey_powder = 10, /datum/reagent/drug/krokodil = 10, /datum/reagent/toxin/acid/nitracid = 10, /datum/reagent/baldium = 10, /datum/reagent/consumable/ethanol/hooch = 10, /datum/reagent/bluespace = 10, /datum/reagent/drug/pumpup = 10, /datum/reagent/consumable/space_cola = 10) + required_temp = 999 + mob_react = FALSE + +/datum/chemical_reaction/omegasoapification/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/soap/omega(location) + /datum/chemical_reaction/candlefication name = "Candlefication" id = "candlefication" diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 5b495fd993a..fc2e4fc61f9 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ