diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3a1ca0e303e..5e36a11ebc6 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -462,6 +462,20 @@ starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 6) desc_antag = "Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes." +/obj/item/storage/box/janitorgloves + name = "janitorial gloves box" + desc = "A box full of janitorial gloves of all shapes and sizes." + max_storage_space = 4 + can_hold = list( + /obj/item/clothing/gloves/janitor + ) + starts_with = list( + /obj/item/clothing/gloves/janitor = 1, + /obj/item/clothing/gloves/janitor/tajara = 1, + /obj/item/clothing/gloves/janitor/unathi = 1, + /obj/item/clothing/gloves/janitor/vaurca = 1 + ) + /obj/item/storage/box/monkeycubes name = "monkey cube box" desc = "Drymate brand monkey cubes. Just add water!" 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 46b1a544408..f6653b68c6e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -11,7 +11,7 @@ new /obj/item/device/radio/headset/headset_service(src) new /obj/item/clothing/under/rank/janitor(src) new /obj/item/clothing/under/rank/janitor/idris(src) - new /obj/item/clothing/gloves/black(src) + new /obj/item/storage/box/janitorgloves(src) new /obj/item/storage/belt/custodial(src) new /obj/item/clothing/accessory/holster/utility/custodial/armpit/brown(src) new /obj/item/clothing/shoes/galoshes(src) @@ -33,4 +33,4 @@ new /obj/item/clothing/suit/caution(src) new /obj/item/clothing/suit/caution(src) new /obj/item/storage/box/lights/mixed(src) - new /obj/item/storage/box/mousetraps(src) \ No newline at end of file + new /obj/item/storage/box/mousetraps(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index 200adb9015f..778792aa8e4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -442,4 +442,4 @@ var/list/card = list() card["zbrojny badge"] = /obj/item/clothing/accessory/tajaran/zbrojny_badge card["golden sun pin"] = /obj/item/clothing/accessory/tajaran/tanker_pin - gear_tweaks += new /datum/gear_tweak/path(card) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/path(card) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index f4ab4e40dc8..a5acc0b1047 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -313,4 +313,4 @@ whitelisted = list(SPECIES_UNATHI) origin_restriction = list(/decl/origin_item/origin/izweski_upper, /decl/origin_item/origin/trad_nobles) sort_category = "Xenowear - Unathi" - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm index 980185d8b51..820edc3851b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm @@ -218,4 +218,4 @@ path = /obj/item/skrell_projector/vaurca_projector sort_category = "Xenowear - Vaurca" whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 7a1c8278e66..ded9f83cb62 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -99,7 +99,7 @@ item_state = "nitrile" species_restricted = list(BODYTYPE_TAJARA) -/obj/item/clothing/gloves/latex/nitrile/vaurca +/obj/item/clothing/gloves/latex/nitrile/vaurca name = "vaurca nitrile gloves" desc = "Sterile nitrile gloves. Designed for Vaurca use." icon_state = "nitrile" @@ -139,10 +139,32 @@ name = "tajaran leather gloves" species_restricted = list(BODYTYPE_TAJARA) -/obj/item/clothing/gloves/botanic_leather/vaurca +/obj/item/clothing/gloves/botanic_leather/vaurca name = "vaurca leather gloves" species_restricted = list(BODYTYPE_VAURCA) +/obj/item/clothing/gloves/janitor + name = "rubber cleaning gloves" + desc = "A pair of thick, long, yellow rubber gloves, designed to protect the wearer from the splash of industrial strength cleaners. Not certified for electrical work." + icon_state = "janitor" + item_state = "janitor" + permeability_coefficient = 0.01 //Prevents chemical seepage as well as latex, but without any of the sterility or protection + siemens_coefficient = 0.50 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' + +/obj/item/clothing/gloves/janitor/unathi + name = "unathi cleaning gloves" + species_restricted = list(BODYTYPE_UNATHI) + +/obj/item/clothing/gloves/janitor/tajara + name = "tajaran cleaning gloves" + species_restricted = list(BODYTYPE_TAJARA) + +/obj/item/clothing/gloves/janitor/vaurca + name = "vaurca cleaning gloves" + species_restricted = list(BODYTYPE_VAURCA) + /* Forcegloves. They amplify force from melee hits as well as muck up disarm and stuff a little. Has bits of code in item_attack.dm, stungloves.dm, human_attackhand, human_defense @@ -396,4 +418,4 @@ desc = "Specially made gloves for investigative personnel. The luminescent threads woven into the material stand out under scrutiny." icon_state = "forensic" item_state = "forensicgloves" - species_restricted = list("exclude",BODYTYPE_GOLEM,BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM,BODYTYPE_VAURCA_BULWARK) \ No newline at end of file + species_restricted = list("exclude",BODYTYPE_GOLEM,BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM,BODYTYPE_VAURCA_BULWARK) diff --git a/html/changelogs/flaminglily-gloves.yml b/html/changelogs/flaminglily-gloves.yml new file mode 100644 index 00000000000..bdeba8fb9f4 --- /dev/null +++ b/html/changelogs/flaminglily-gloves.yml @@ -0,0 +1,42 @@ +################################ +# 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: FlamingLily + +# 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 cleaning gloves for Janitorial. They protect against chemicals, but not much else." + - imageadd: "Added a sprite for the janitorial cleaning gloves." diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index df3825f7131..55edf32c858 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/items/clothing/lefthand_gloves.dmi b/icons/mob/items/clothing/lefthand_gloves.dmi index 0c39c5d4f8b..11a31c4edb7 100644 Binary files a/icons/mob/items/clothing/lefthand_gloves.dmi and b/icons/mob/items/clothing/lefthand_gloves.dmi differ diff --git a/icons/mob/items/clothing/righthand_gloves.dmi b/icons/mob/items/clothing/righthand_gloves.dmi index 5ec63f35f09..21d2958f121 100644 Binary files a/icons/mob/items/clothing/righthand_gloves.dmi and b/icons/mob/items/clothing/righthand_gloves.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 120e5c441d3..aadffd07418 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ