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 2762803eab3..53d76334b2b 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ 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,