diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a601c9dd7ca..4152a1dd2e9 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1327,11 +1327,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/alienmedicalgloves name = "Non-Human Sterile Glove Kit" contains = list(/obj/item/clothing/gloves/latex/unathi, - /obj/item/clothing/gloves/latex/unathi, - /obj/item/clothing/gloves/latex/unathi, + /obj/item/clothing/gloves/latex/nitrile/unathi, + /obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/clothing/gloves/latex/tajara, - /obj/item/clothing/gloves/latex/tajara, - /obj/item/clothing/gloves/latex/tajara) + /obj/item/clothing/gloves/latex/nitrile/tajara, + /obj/item/clothing/gloves/latex/nitrile/tajara) cost = 25 containertype = /obj/structure/closet/crate containername = "speciality sterile gloves kit" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 84490ae6c5d..9542db9f2e9 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -152,8 +152,8 @@ /obj/item/storage/box/gloves name = "box of sterile gloves" desc = "Contains sterile gloves." - icon_state = "latex" - starts_with = list(/obj/item/clothing/gloves/latex = 4, /obj/item/clothing/gloves/latex/nitrile = 3) + icon_state = "nitrile" + starts_with = list(/obj/item/clothing/gloves/latex = 2, /obj/item/clothing/gloves/latex/nitrile = 5) /obj/item/storage/box/masks name = "box of sterile masks" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 3d3328c09f3..15f14017372 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -109,7 +109,7 @@ new /obj/item/clothing/shoes/medical(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/cartridge/cmo(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/gloves/latex/nitrile(src) new /obj/item/device/radio/headset/heads/cmo(src) new /obj/item/device/radio/headset/heads/cmo/alt(src) new /obj/item/device/flash(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index b4b7a0445e5..4d433dba80a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -38,7 +38,7 @@ new /obj/item/cartridge/rd(src) new /obj/item/clothing/shoes/science(src) new /obj/item/clothing/shoes/leather(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/gloves/latex/nitrile(src) new /obj/item/device/radio/headset/heads/rd(src) new /obj/item/device/radio/headset/heads/rd/alt(src) new /obj/item/tank/air(src) @@ -64,6 +64,6 @@ new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/science(src) new /obj/item/clothing/shoes/leather(src) - new /obj/item/clothing/gloves/latex(src) + new /obj/item/clothing/gloves/latex/nitrile(src) new /obj/item/device/radio/headset/heads/rd(src) new /obj/item/device/radio/headset/heads/rd/alt(src) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index cb03ae03c69..de876541340 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -76,6 +76,20 @@ icon_state = "nitrile" item_state = "ngloves" +/obj/item/clothing/gloves/latex/nitrile/unathi + name = "unathi nitrile gloves" + desc = "Sterile nitrile gloves. Designed for Unathi use." + icon_state = "nitrile" + item_state = "ngloves" + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/latex/nitrile/tajara + name = "tajaran nitrile gloves" + desc = "Sterile nitrile gloves. Designed for Tajara use." + icon_state = "nitrile" + item_state = "ngloves" + species_restricted = list("Tajara") + /obj/item/clothing/gloves/latex/unathi name = "unathi latex gloves" desc = "Sterile latex gloves. Designed for Unathi use." diff --git a/html/changelogs/furrycactus - no more latex.yml b/html/changelogs/furrycactus - no more latex.yml new file mode 100644 index 00000000000..6226c29cea5 --- /dev/null +++ b/html/changelogs/furrycactus - no more latex.yml @@ -0,0 +1,44 @@ +################################ +# 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: Furrycactus + +# 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: "Sterile gloves boxes have had their contents adjusted. Instead of 4x latex gloves and 3x nitrile gloves, they have 2x latex gloves and 5x nitrile gloves." + - rscadd: "Added nitrile glove variants for Unathi and Tajara." + - maptweak: "Replaced most instances of latex gloves with nitrile gloves, and made xeno variants far more accessible. Latex allergies are no joke, kids." + - imageadd: "Changed the icon for the sterile gloves box to show a blue glove icon instead of white." \ No newline at end of file diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 766b3f9d35f..1bc5548e065 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 70fa7075bba..6ed1ccce5d6 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -11083,11 +11083,11 @@ /area/outpost/research/hallway) "awZ" = ( /obj/structure/table/rack, -/obj/item/clothing/suit/bio_suit/anomaly, -/obj/item/clothing/head/bio_hood/anomaly, -/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/item/clothing/mask/breath, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, /turf/simulated/floor/plating, /area/rnd/xenoarch_storage) "axa" = ( @@ -11703,7 +11703,7 @@ /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/suit/space/void/sci, /obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, @@ -11907,7 +11907,7 @@ /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/suit/space/void/sci, /obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, @@ -12262,7 +12262,7 @@ /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex/nitrile, /obj/item/clothing/suit/space/void/sci, /obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, @@ -15605,11 +15605,11 @@ req_access = list(7) }, /obj/structure/table/rack, -/obj/item/clothing/suit/bio_suit/anomaly, -/obj/item/clothing/head/bio_hood/anomaly, -/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/item/clothing/mask/breath, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "aFP" = ( @@ -21716,6 +21716,8 @@ /obj/item/clothing/gloves/latex/unathi, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled, /area/medical/medbay4) "aSM" = ( @@ -22304,6 +22306,8 @@ /obj/item/clothing/gloves/latex/unathi, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled, /area/medical/medbay4) "aUE" = ( @@ -30823,6 +30827,8 @@ /obj/structure/closet/excavation, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/storage/box/samplebags, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled, /area/rnd/eva) "jQd" = ( @@ -32142,6 +32148,8 @@ c_tag = "Research Sublevel - EVA Preparation"; dir = 4 }, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled, /area/rnd/eva) "nsu" = ( @@ -33685,6 +33693,8 @@ pixel_x = 0; pixel_y = -26 }, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled, /area/rnd/eva) "qNL" = ( @@ -35136,11 +35146,11 @@ req_access = list(7) }, /obj/structure/table/rack, -/obj/item/clothing/suit/bio_suit/anomaly, -/obj/item/clothing/head/bio_hood/anomaly, -/obj/item/clothing/gloves/latex, /obj/item/clothing/glasses/science, /obj/item/clothing/mask/breath, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "tUS" = ( @@ -78781,7 +78791,7 @@ aaa aaa aaa aaa -aaa +aba aba aba aba diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 5baf5b55d96..aa7a97d559d 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -32100,6 +32100,10 @@ icon_state = "corner_white_full"; dir = 4 }, +/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, /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "bdx" = ( @@ -35733,6 +35737,8 @@ c_tag = "Medical - CMO's Office" }, /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt2, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bjq" = ( @@ -47706,6 +47712,8 @@ icon_state = "xmaslights"; dir = 4 }, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, /turf/simulated/floor/tiled/white, /area/rnd/rdoffice) "bCw" = ( @@ -51487,6 +51495,14 @@ dir = 8 }, /obj/structure/closet/secure_closet/scientist, +/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/storage/box/gloves{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/tiled/white, /area/rnd/telesci) "bJz" = ( @@ -72595,8 +72611,6 @@ /obj/structure/closet/chefcloset{ desc = "It's a storage unit for foodservice equipment." }, -/obj/item/clothing/gloves/latex/unathi, -/obj/item/clothing/gloves/latex/tajara, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, /obj/item/device/nanoquikpay{ @@ -72605,6 +72619,10 @@ /obj/item/device/destTagger, /obj/item/stack/packageWrap, /obj/item/hand_labeler, +/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, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "yfI" = (