diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 06ede96bbb3..269d3dc37aa 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1238,6 +1238,16 @@ . = ..() make_exact_fit() +/obj/item/storage/box/cleaner_tablets + name = "\improper Idris cleaner tablets box" + desc = "A box of advanced formula chemical tablets designed by Idris Incorporated." + desc_extended = "A new generation of cleaning chemicals, according to Idris at least. The instructions on the box reads: \"Dissolve tablet fully in container of water\". A warning label mentions that you should not consume the tablets nor drink the mixture after dissolving them." + illustration = "soapbucket" + max_storage_space = 16 + starts_with = list( + /obj/item/reagent_containers/pill/cleaner_tablet = 16 + ) + /obj/item/storage/box/led_collars name = "box of LED collars" desc = "A box containing eight LED collars, usually worn around the neck of the voidsuit." @@ -1299,3 +1309,4 @@ starts_with = list( /obj/item/reagent_containers/food/snacks/grown/konyang_tea/jaekseol = 7 ) + diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index e16d32ae250..3e6b1c596d2 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -119,6 +119,7 @@ /obj/item/storage/box/lights/colored/yellow = 0.1, /obj/item/storage/box/lights/coloredmixed = 0.2, /obj/item/storage/box/masks = 0.5, + /obj/item/storage/box/cleaner_tablets = 0.4, /obj/item/storage/box/mousetraps = 0.3, /obj/item/storage/box/pineapple = 0.1, /obj/item/storage/box/smokebombs = 0.1, @@ -161,6 +162,7 @@ /obj/item/device/synthesized_instrument/violin = 0.1, /obj/item/device/synthesized_instrument/guitar = 1, /obj/item/device/synthesized_instrument/trumpet = 0.25, + /obj/item/reagent_containers/pill/cleaner_tablet = 0.6, /obj/item/storage/box/fancy/food/pralinebox = 0.1 ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index 69f9e25aadf..3bed4e24889 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -31,6 +31,7 @@ new /obj/item/taperoll/custodial(src) new /obj/item/storage/box/lights/mixed(src) new /obj/item/storage/box/mousetraps(src) + new /obj/item/storage/box/cleaner_tablets(src) // Away Ship/Site Custodial Locker /obj/structure/closet/secure_closet/custodial/offship diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 44f3ab4fd19..a01703b7627 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -363,3 +363,10 @@ desc = "A prophylactic antibiotic that kills infections before they start." icon_state = "pill8" reagents_to_add = list(/singleton/reagent/steramycin = 5) + +/obj/item/reagent_containers/pill/cleaner_tablet + name = "dissolvable cleaner tablet" + desc = "An advanced formula dissolvable tablet laden with the cutting edge of Idris chemical science. Smells like dried bleach. It's probably just bleach." + icon_state = "cleanertablet" + reagents_to_add = list(/singleton/reagent/spacecleaner = 15) + diff --git a/html/changelogs/HanSolo1519-PR-#18307.yml b/html/changelogs/HanSolo1519-PR-#18307.yml new file mode 100644 index 00000000000..af9502b7077 --- /dev/null +++ b/html/changelogs/HanSolo1519-PR-#18307.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: HanSolo1519 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added dissolvable cleaner tablets, places cleaner tablets in maint loot table and janitorial closets." diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 79cb2f28261..042ed057e63 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/storage/boxes.dmi b/icons/obj/storage/boxes.dmi index 45d36e46982..e5b3c831f7f 100644 Binary files a/icons/obj/storage/boxes.dmi and b/icons/obj/storage/boxes.dmi differ