From a8ecf51d1e9b55d6d917d6465a0d2b56ce5c4d3f Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Sun, 26 Jun 2022 19:02:44 +0800 Subject: [PATCH] Nitrile glove boxes now like any other regular box. (#14283) --- aurorastation.dme | 1 - .../objects/items/weapons/storage/boxes.dm | 6 +- .../items/weapons/storage/nitrilebox.dm | 78 ------------------ code/modules/clothing/clothing.dm | 2 +- html/changelogs/wezzy_revertnitrilebox.yml | 42 ++++++++++ icons/obj/storage.dmi | Bin 73348 -> 73058 bytes maps/aurora/aurora-1_centcomm.dmm | 16 ++-- maps/aurora/aurora-3_sublevel.dmm | 2 +- maps/aurora/aurora-4_mainlevel.dmm | 14 ++-- maps/aurora/aurora-6_surface.dmm | 2 +- maps/away/generic/racers.dmm | 2 +- maps/away/generic/space_bar.dmm | 2 +- maps/away/romanovich/grand_romanovich.dmm | 2 +- maps/dungeon_spawns/skrell_crash_unique.dmm | 2 +- maps/event/odin_departure/odin_depature-1.dmm | 16 ++-- maps/event/rooftop/rooftop-1.dmm | 4 +- maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 14 ++-- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 43 +++++----- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 21 ++--- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 22 +++-- maps/templates/distress/iac.dmm | 2 +- 21 files changed, 126 insertions(+), 167 deletions(-) delete mode 100644 code/game/objects/items/weapons/storage/nitrilebox.dm create mode 100644 html/changelogs/wezzy_revertnitrilebox.yml diff --git a/aurorastation.dme b/aurorastation.dme index 90988f45fa2..00282aa6f5e 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1070,7 +1070,6 @@ #include "code\game\objects\items\weapons\storage\laundry_basket.dm" #include "code\game\objects\items\weapons\storage\lockbox.dm" #include "code\game\objects\items\weapons\storage\misc.dm" -#include "code\game\objects\items\weapons\storage\nitrilebox.dm" #include "code\game\objects\items\weapons\storage\secure.dm" #include "code\game\objects\items\weapons\storage\storage.dm" #include "code\game\objects\items\weapons\storage\toolbox.dm" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 5e36a11ebc6..29ba9a36dd2 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -185,7 +185,11 @@ name = "box of sterile gloves" desc = "Contains sterile gloves." icon_state = "nitrile" - starts_with = list(/obj/item/clothing/gloves/latex = 2, /obj/item/clothing/gloves/latex/nitrile = 5) + starts_with = list(/obj/item/clothing/gloves/latex = 2, + /obj/item/clothing/gloves/latex/nitrile = 2, + /obj/item/clothing/gloves/latex/nitrile/unathi, + /obj/item/clothing/gloves/latex/nitrile/tajara, + /obj/item/clothing/gloves/latex/nitrile/vaurca) /obj/item/storage/box/masks name = "box of surgical masks" diff --git a/code/game/objects/items/weapons/storage/nitrilebox.dm b/code/game/objects/items/weapons/storage/nitrilebox.dm deleted file mode 100644 index 10af6cde53c..00000000000 --- a/code/game/objects/items/weapons/storage/nitrilebox.dm +++ /dev/null @@ -1,78 +0,0 @@ -/obj/item/nitrilebox - name = "nitrile gloves box" - desc = "Contains nitrile gloves." - icon = 'icons/obj/storage.dmi' - icon_state = "nitrilebox" - item_state = "sheet-metal" - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - throwforce = 1 - w_class = ITEMSIZE_NORMAL - throw_speed = 3 - throw_range = 7 - layer = OBJ_LAYER - 0.1 - var/amount = 50 //How much paper is in the bin. Gloves, actually, but this code is copied from the paper bin code. - -/obj/item/nitrilebox/MouseDrop(mob/user) - if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) - if(!istype(usr, /mob/living/carbon/slime) && !istype(usr, /mob/living/simple_animal)) - if( !usr.get_active_hand() ) //if active hand is empty - var/mob/living/carbon/human/H = user - var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] - - if (H.hand) - temp = H.organs_by_name[BP_L_HAND] - if(temp && !temp.is_usable()) - to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) - return - - to_chat(user, SPAN_NOTICE("You pick up [src].")) - user.put_in_hands(src) - - return - -/obj/item/nitrilebox/attack_hand(mob/user) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] - if (H.hand) - temp = H.organs_by_name[BP_L_HAND] - if(temp && !temp.is_usable()) - to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) - return - if(amount > 0) - var/list/glove_types = list( - "Standard Gloves" = /obj/item/clothing/gloves/latex/nitrile, - "Unathi Gloves" = /obj/item/clothing/gloves/latex/nitrile/unathi, - "Tajara Gloves" = /obj/item/clothing/gloves/latex/nitrile/tajara, - "Vaurca Gloves" = /obj/item/clothing/gloves/latex/nitrile/vaurca - ) - var/chosen_type = input(user, "Which pair of gloves would you like?", capitalize_first_letters(name)) as null|anything in glove_types - if(!chosen_type) - add_fingerprint(user) - return - amount-- - var/chosen_path = glove_types[chosen_type] - var/obj/item/clothing/gloves/latex/nitrile/P = new chosen_path(get_turf(src)) - user.put_in_hands(P) - to_chat(user, SPAN_NOTICE("You take \the [P] out of \the [src].")) - else - to_chat(user, SPAN_NOTICE("[src] is empty!")) - - add_fingerprint(user) - return - - -/obj/item/nitrilebox/attackby(obj/item/O, mob/user) - if(istype(O, /obj/item/clothing/gloves/latex/nitrile)) - to_chat(user, SPAN_WARNING("The box is designed to not allow gloves to be put back in. Besides, it would be unsanitary.")) - - -/obj/item/nitrilebox/examine(mob/user) - if(get_dist(src, user) <= 1) - if(amount) - to_chat(user, SPAN_NOTICE("There " + (amount > 1 ? "are [amount] pairs of gloves" : "is one pair of gloves") + " in the box.")) - else - to_chat(user, SPAN_NOTICE("There are no gloves in the box. Time to throw it away.")) - return - diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c429d6e10e9..3c079fb9ed7 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -418,7 +418,7 @@ /obj/item/clothing/gloves/attackby(obj/item/W, mob/user) ..() - if(W.iswirecutter() || istype(W, /obj/item/surgery/scalpel)) + if(is_sharp(W)) if(clipped) to_chat(user, SPAN_NOTICE("\The [src] have already been clipped!")) update_icon() diff --git a/html/changelogs/wezzy_revertnitrilebox.yml b/html/changelogs/wezzy_revertnitrilebox.yml new file mode 100644 index 00000000000..9c3bfb6df8f --- /dev/null +++ b/html/changelogs/wezzy_revertnitrilebox.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: Wowzewow (Wezzy) + +# 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: + - tweak: "Reverts nitrile boxes so they work like normal boxes again. You can still find corresponding xenowear gloves in each box." + - balance: "You can snip gloves much more liberally now, so long as the item you use is sharp." diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 2762803eab3d61eefb36fa2a0feddaa0d11252dd..53d76334b2bb556ee7443544c06290ad3eaf633b 100644 GIT binary patch delta 11873 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 delta 12165 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 VBFy)p#u|WnDaonHmP?z5{12&)x0nC` diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 4d978d2548d..a732ecb3661 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -9479,7 +9479,7 @@ }, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 9 }, @@ -16951,7 +16951,7 @@ icon_state = "railing0-1"; name = "railing" }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = -12; pixel_y = 11 }, @@ -21192,7 +21192,7 @@ pixel_y = 6 }, /obj/item/storage/box/masks, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/fire{ layer = 2.9; @@ -28994,7 +28994,7 @@ /area/shuttle/escape) "oGs" = ( /obj/structure/table/standard, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/item/reagent_containers/hypospray/autoinjector/survival, @@ -32154,7 +32154,7 @@ pixel_y = -8 }, /obj/item/reagent_containers/syringe, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = 12 }, /obj/item/reagent_containers/glass/bottle/inaprovaline{ @@ -37262,7 +37262,7 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/machinery/light{ dir = 4; @@ -37995,7 +37995,7 @@ "uTK" = ( /obj/structure/table/standard, /obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = -8 }, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -38618,7 +38618,7 @@ /area/centcom/legion/hangar5) "vrQ" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 47bb22f365e..36369e5233e 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -1688,7 +1688,7 @@ /obj/structure/table/rack, /obj/item/storage/toolbox/emergency, /obj/item/storage/box/samplebags, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/lights/mixed{ pixel_x = 5; pixel_y = -2 diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 296541efbc4..02d08c6a78f 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -4373,7 +4373,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -13368,7 +13368,7 @@ /obj/item/clothing/gloves/latex/nitrile/tajara, /obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/corner_wide/mauve/full{ dir = 8 }, @@ -30958,7 +30958,7 @@ icon_state = "tube1" }, /obj/item/storage/box/masks, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/assembly/robotics_cyborgification) "bbz" = ( @@ -41121,7 +41121,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/corner/lime{ dir = 10 }, @@ -44956,7 +44956,7 @@ name = "Station Intercom (General)"; pixel_y = -24 }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = 4 }, /turf/simulated/floor/tiled, @@ -45152,7 +45152,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -50828,7 +50828,7 @@ req_access = list(28) }, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 13 }, diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 283a644b705..7e447e57333 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -20164,7 +20164,7 @@ pixel_x = -6; pixel_y = 12 }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 5; pixel_y = -1 }, diff --git a/maps/away/generic/racers.dmm b/maps/away/generic/racers.dmm index 31482159205..5be68a75fa1 100644 --- a/maps/away/generic/racers.dmm +++ b/maps/away/generic/racers.dmm @@ -2823,7 +2823,7 @@ "nVi" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 13 }, diff --git a/maps/away/generic/space_bar.dmm b/maps/away/generic/space_bar.dmm index 678fa4c8cbc..ce0d9c1798e 100644 --- a/maps/away/generic/space_bar.dmm +++ b/maps/away/generic/space_bar.dmm @@ -272,7 +272,7 @@ "aIw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 13 }, diff --git a/maps/away/romanovich/grand_romanovich.dmm b/maps/away/romanovich/grand_romanovich.dmm index eaf546c04f6..bc0cffe1b6a 100644 --- a/maps/away/romanovich/grand_romanovich.dmm +++ b/maps/away/romanovich/grand_romanovich.dmm @@ -4228,7 +4228,7 @@ /area/grand_romanovich) "ll" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, diff --git a/maps/dungeon_spawns/skrell_crash_unique.dmm b/maps/dungeon_spawns/skrell_crash_unique.dmm index 1057669ec7a..4ac17b0fbb0 100644 --- a/maps/dungeon_spawns/skrell_crash_unique.dmm +++ b/maps/dungeon_spawns/skrell_crash_unique.dmm @@ -333,7 +333,7 @@ /turf/simulated/floor/shuttle/advanced, /area/dungeon/skrell_ship) "bh" = ( -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ icon_state = "loadingarea"; diff --git a/maps/event/odin_departure/odin_depature-1.dmm b/maps/event/odin_departure/odin_depature-1.dmm index f87e1046e85..4c51d6875a7 100644 --- a/maps/event/odin_departure/odin_depature-1.dmm +++ b/maps/event/odin_departure/odin_depature-1.dmm @@ -9682,7 +9682,7 @@ }, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 9 }, @@ -17286,7 +17286,7 @@ icon_state = "railing0-1"; name = "railing" }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = -12; pixel_y = 11 }, @@ -21597,7 +21597,7 @@ pixel_y = 6 }, /obj/item/storage/box/masks, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/fire{ layer = 2.9; @@ -29524,7 +29524,7 @@ /area/shuttle/escape) "oGs" = ( /obj/structure/table/standard, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/item/reagent_containers/hypospray/autoinjector/survival, @@ -32697,7 +32697,7 @@ pixel_y = -8 }, /obj/item/reagent_containers/syringe, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = 12 }, /obj/item/reagent_containers/glass/bottle/inaprovaline{ @@ -37890,7 +37890,7 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/machinery/light{ dir = 4; @@ -38639,7 +38639,7 @@ "uTK" = ( /obj/structure/table/standard, /obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = -8 }, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -39263,7 +39263,7 @@ /area/centcom/legion/hangar5) "vrQ" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 24dc006addd..8a7e1cf0264 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -1593,7 +1593,7 @@ /area/shuttle/city) "ie" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, @@ -4861,7 +4861,7 @@ /area/city/mendell/interior) "BJ" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 1a15b348386..169c7a939f4 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -5294,7 +5294,6 @@ /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, /obj/item/clothing/mask/gas/alt, -/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/glasses/science, /obj/item/tank/oxygen, /obj/item/clothing/head/bio_hood/anomaly, @@ -5311,6 +5310,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "epn" = ( @@ -5847,7 +5847,7 @@ "eJu" = ( /obj/structure/window/reinforced, /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 5; pixel_y = -1 }, @@ -6213,7 +6213,6 @@ /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, /obj/item/clothing/mask/gas/alt, -/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/glasses/science, /obj/item/tank/oxygen, /obj/item/clothing/head/bio_hood/anomaly, @@ -6230,6 +6229,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "eWN" = ( @@ -10101,7 +10101,7 @@ dir = 1; icon_state = "tube1" }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/dark, @@ -10834,7 +10834,7 @@ "iFU" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/steel, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -22944,7 +22944,6 @@ /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, /obj/item/clothing/mask/gas/alt, -/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/glasses/science, /obj/item/tank/oxygen, /obj/item/clothing/head/bio_hood/anomaly, @@ -22961,6 +22960,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "sJJ" = ( @@ -24372,7 +24372,7 @@ /obj/structure/table/rack, /obj/item/storage/toolbox/emergency, /obj/item/storage/box/samplebags, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/lights/mixed{ pixel_x = 5; pixel_y = -2 diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 44bfc2ffbef..5dab71fc54c 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -9227,7 +9227,7 @@ pixel_x = -9; pixel_y = 6 }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 5; pixel_y = -2 }, @@ -13221,6 +13221,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/or2) "hdG" = ( @@ -22850,12 +22851,7 @@ dir = 10 }, /obj/structure/closet/wardrobe/pharmacy_white, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/vaurca, -/obj/item/clothing/gloves/latex/nitrile/vaurca, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "mCE" = ( @@ -23296,7 +23292,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "mNN" = ( @@ -30244,6 +30240,14 @@ }, /turf/simulated/floor/tiled/freezer, /area/horizon/crew_quarters/washroom/central) +"qzF" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/storage/box/gloves, +/obj/item/storage/box/gloves, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "qzH" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -30587,6 +30591,10 @@ /obj/machinery/firealarm/south, /turf/simulated/floor/plating, /area/engineering/engine_room) +"qGa" = ( +/obj/item/storage/box/gloves, +/turf/simulated/wall, +/area/medical/or1) "qGp" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -34572,7 +34580,7 @@ pixel_y = 10; req_access = list(66) }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks{ pixel_x = 4; pixel_y = 4 @@ -39036,8 +39044,6 @@ "viR" = ( /obj/structure/closet/secure_closet/RD, /obj/item/clothing/mask/gas/half, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, /obj/effect/floor_decal/corner/mauve/diagonal, /obj/item/device/megaphone/sci, /obj/effect/floor_decal/corner/white{ @@ -39046,6 +39052,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 8 }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hor) "vjN" = ( @@ -39590,7 +39597,7 @@ pixel_y = 10; req_access = list(66) }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks{ pixel_x = 4; pixel_y = 4 @@ -39991,11 +39998,7 @@ /obj/structure/closet/secure_closet/scientist, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "vMl" = ( @@ -60624,8 +60627,8 @@ qgf xhj wxr wxr -wxr -wxr +qGa +qGa nIi tHs uZU @@ -71941,7 +71944,7 @@ iic gBT urh tvX -vLu +qzF vLu kGX vEg diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 0cea1786a39..3ff595ad6f7 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -1684,10 +1684,7 @@ dir = 8 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/unathi, -/obj/item/clothing/gloves/latex/tajara, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/equipment) "dk" = ( @@ -1695,15 +1692,12 @@ dir = 8 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/unathi, -/obj/item/clothing/gloves/latex/tajara, /obj/item/device/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = 24 }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/equipment) "dl" = ( @@ -6368,13 +6362,10 @@ dir = 8 }, /obj/structure/closet/secure_closet/medical3, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/unathi, -/obj/item/clothing/gloves/latex/tajara, /obj/machinery/camera/network/medbay{ c_tag = "Medical - Secondary Storage" }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/medical/equipment) "lK" = ( @@ -8347,7 +8338,7 @@ /turf/simulated/floor/tiled/dark, /area/medical/ward/isolation) "pq" = ( -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 1; pixel_y = -1 }, @@ -12506,6 +12497,7 @@ "xa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "xb" = ( @@ -14863,8 +14855,6 @@ }, /obj/structure/closet/secure_closet/CMO, /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/device/megaphone, /obj/item/device/eftpos{ eftpos_name = "Medbay EFTPOS scanner" @@ -14872,6 +14862,7 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - CMO's Office" }, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Bz" = ( diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 16dc0ec0102..253a0ba603d 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -2878,7 +2878,7 @@ pixel_y = 6 }, /obj/item/storage/box/masks, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/fire{ layer = 2.9; @@ -5682,7 +5682,7 @@ }, /obj/item/reagent_containers/food/condiment/flour, /obj/structure/table/stone/marble, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 4; pixel_y = 9 }, @@ -8644,7 +8644,7 @@ /area/centcom/holding) "auj" = ( /obj/structure/table/standard, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = 11; pixel_y = 12 }, @@ -10889,7 +10889,7 @@ icon_state = "railing0-1"; name = "railing" }, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_x = -12; pixel_y = 11 }, @@ -21950,7 +21950,7 @@ /area/centcom/legion) "bao" = ( /obj/structure/table/standard, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/item/reagent_containers/hypospray/autoinjector/survival, @@ -23409,7 +23409,7 @@ "bdc" = ( /obj/structure/table/standard, /obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = -8 }, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -25895,7 +25895,7 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/masks, /obj/machinery/light{ dir = 4; @@ -30935,8 +30935,6 @@ /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, @@ -30952,6 +30950,7 @@ req_access = null }, /obj/item/storage/backpack/messenger/med, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "bsS" = ( @@ -31616,7 +31615,7 @@ pixel_y = -8 }, /obj/item/reagent_containers/syringe, -/obj/item/nitrilebox{ +/obj/item/storage/box/gloves{ pixel_y = 12 }, /obj/item/reagent_containers/glass/bottle/inaprovaline{ @@ -33830,14 +33829,12 @@ /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/regular, -/obj/item/clothing/gloves/latex, /obj/item/reagent_containers/glass/bottle/peridaxon, /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, -/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, /obj/random/medical, @@ -33849,6 +33846,7 @@ /obj/item/reagent_containers/glass/bottle/bicaridine, /obj/item/reagent_containers/glass/bottle/dermaline, /obj/item/reagent_containers/glass/bottle/thetamycin, +/obj/item/storage/box/gloves, /turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "bBy" = ( diff --git a/maps/templates/distress/iac.dmm b/maps/templates/distress/iac.dmm index 91efaaf581d..076d14e4b88 100644 --- a/maps/templates/distress/iac.dmm +++ b/maps/templates/distress/iac.dmm @@ -116,7 +116,7 @@ /obj/item/roller, /obj/item/roller, /obj/item/storage/box/masks, -/obj/item/nitrilebox, +/obj/item/storage/box/gloves, /obj/item/storage/box/bodybags, /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/adv,