diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 0ba97457fe4..17d478f92ec 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -176,6 +176,11 @@ path = /obj/item/towel flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/handkerchief + display_name = "handkerchief" + path = /obj/item/reagent_containers/glass/rag/handkerchief + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/gameboard display_name = "holo board game" path = /obj/item/board diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 07a7deca815..2e7b2b93efc 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -24,16 +24,16 @@ volume = 10 can_be_placed_into = null flags = OPENCONTAINER | NOBLUDGEON - unacidable = 0 + unacidable = FALSE + fragile = FALSE + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' var/on_fire = 0 var/burn_time = 20 //if the rag burns for too long it turns to ashes var/cleantime = 30 - drop_sound = 'sound/items/drop/cloth.ogg' - pickup_sound = 'sound/items/pickup/cloth.ogg' var/last_clean var/clean_msg = FALSE - fragile = 0 /obj/item/reagent_containers/glass/rag/Initialize() . = ..() @@ -301,3 +301,9 @@ possible_transfer_amounts = list(5) volume = 10 cleantime = 15 + +/obj/item/reagent_containers/glass/rag/handkerchief + name = "handkerchief" + desc = "For cleaning a lady's hand, your bruised ego or a crime scene." + volume = 5 + icon_state = "handkerchief" \ No newline at end of file diff --git a/html/changelogs/mattatlas-thankscschwann.yml b/html/changelogs/mattatlas-thankscschwann.yml new file mode 100644 index 00000000000..6788ecbdd0c --- /dev/null +++ b/html/changelogs/mattatlas-thankscschwann.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: MattAtlas + +# 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 a handkerchief to the loadout under the General tab, a subtype of the rag." diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 07edd4c7f42..feeebc1425e 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ