From 79c265efb3860c52a184d6a650f2702413465960 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sat, 4 Jun 2022 06:05:18 +0100 Subject: [PATCH] Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607) * fixes box ID/names for mask and gloves. Adds nitrile box * map update for ID change * crate fills fix --- Resources/Maps/atlas.yml | 4 +-- Resources/Maps/bagel.yml | 8 +++--- Resources/Maps/barratry.yml | 4 +-- Resources/Maps/delta.yml | 8 +++--- Resources/Maps/marathon.yml | 8 +++--- Resources/Maps/moose.yml | 6 ++--- Resources/Maps/nss_pillar.yml | 12 ++++----- Resources/Maps/packedstation.yml | 2 +- Resources/Maps/saltern.yml | 6 ++--- Resources/Maps/splitstation.yml | 20 +++++++-------- Resources/Maps/waystation.yml | 24 +++++++++--------- .../Catalog/Fills/Boxes/medical.yml | 23 ++++++++++++++--- .../Catalog/Fills/Crates/medical.yml | 4 +-- .../Objects/Storage/boxes.rsi/meta.json | 3 +++ .../Objects/Storage/boxes.rsi/nitrile.png | Bin 0 -> 189 bytes 15 files changed, 75 insertions(+), 57 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index 62063aa2bd..963bf717fb 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -32446,7 +32446,7 @@ entities: parent: 30 type: Transform - uid: 2762 - type: BoxLatex + type: BoxLatexGloves components: - pos: 10.618573,-10.325268 parent: 30 @@ -32518,7 +32518,7 @@ entities: parent: 30 type: Transform - uid: 2772 - type: BoxSterile + type: BoxSterileMask components: - pos: 0.5569134,-20.455555 parent: 30 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 7ddba0b584..cab6ab5714 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -25341,7 +25341,7 @@ entities: parent: 60 type: Transform - uid: 261 - type: BoxLatex + type: BoxLatexGloves components: - pos: 39.731613,-10.351491 parent: 60 @@ -55566,7 +55566,7 @@ entities: parent: 60 type: Transform - uid: 3336 - type: BoxLatex + type: BoxLatexGloves components: - pos: 51.726803,-25.342684 parent: 60 @@ -90244,7 +90244,7 @@ entities: parent: 60 type: Transform - uid: 7282 - type: BoxSterile + type: BoxSterileMask components: - pos: 39.184265,-10.335866 parent: 60 @@ -103123,7 +103123,7 @@ entities: - canCollide: False type: Physics - uid: 8888 - type: BoxSterile + type: BoxSterileMask components: - pos: 51.178062,-25.257103 parent: 60 diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml index 909ca17fd7..4f4626b6d4 100644 --- a/Resources/Maps/barratry.yml +++ b/Resources/Maps/barratry.yml @@ -74497,7 +74497,7 @@ entities: parent: 106 type: Transform - uid: 6057 - type: BoxSterile + type: BoxSterileMask components: - pos: 34.5,-6.5 parent: 106 @@ -129625,7 +129625,7 @@ entities: parent: 106 type: Transform - uid: 11287 - type: BoxSterile + type: BoxSterileMask components: - pos: 17.5,2.5 parent: 106 diff --git a/Resources/Maps/delta.yml b/Resources/Maps/delta.yml index 4b52a635c8..2e6aa3331b 100644 --- a/Resources/Maps/delta.yml +++ b/Resources/Maps/delta.yml @@ -268446,7 +268446,7 @@ entities: ents: [] type: ContainerContainer - uid: 24410 - type: BoxSterile + type: BoxSterileMask components: - pos: 36.289875,-71.40648 parent: 60 @@ -284908,7 +284908,7 @@ entities: - canCollide: False type: Physics - uid: 25735 - type: BoxSterile + type: BoxSterileMask components: - pos: 24.376677,-24.29746 parent: 60 @@ -284920,7 +284920,7 @@ entities: ents: [] type: ContainerContainer - uid: 25736 - type: BoxSterile + type: BoxSterileMask components: - pos: 24.657927,-24.51621 parent: 60 @@ -356349,7 +356349,7 @@ entities: parent: 60 type: Transform - uid: 32260 - type: BoxLatex + type: BoxLatexGloves components: - pos: 67.52483,3.6691782 parent: 60 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 23f966083d..d034c3825d 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -81643,7 +81643,7 @@ entities: - canCollide: False type: Physics - uid: 7022 - type: BoxSterile + type: BoxSterileMask components: - pos: -21.456934,-19.32787 parent: 30 @@ -81655,7 +81655,7 @@ entities: ents: [] type: ContainerContainer - uid: 7023 - type: BoxLatex + type: BoxLatexGloves components: - pos: -21.488184,-19.374744 parent: 30 @@ -92747,7 +92747,7 @@ entities: ents: [] type: ContainerContainer - uid: 8275 - type: BoxLatex + type: BoxLatexGloves components: - pos: -31.539986,-23.431513 parent: 30 @@ -92759,7 +92759,7 @@ entities: ents: [] type: ContainerContainer - uid: 8276 - type: BoxSterile + type: BoxSterileMask components: - pos: -31.539986,-23.806513 parent: 30 diff --git a/Resources/Maps/moose.yml b/Resources/Maps/moose.yml index 628d601dda..8daa3887f2 100644 --- a/Resources/Maps/moose.yml +++ b/Resources/Maps/moose.yml @@ -40962,7 +40962,7 @@ entities: ents: [] type: ContainerContainer - uid: 3338 - type: BoxSterile + type: BoxSterileMask components: - pos: -32.896896,-20.345268 parent: 61 @@ -84986,7 +84986,7 @@ entities: parent: 61 type: Transform - uid: 8775 - type: BoxSterile + type: BoxSterileMask components: - pos: -16.37624,-24.480099 parent: 61 @@ -84998,7 +84998,7 @@ entities: ents: [] type: ContainerContainer - uid: 8776 - type: BoxLatex + type: BoxLatexGloves components: - pos: -16.579365,-24.401974 parent: 61 diff --git a/Resources/Maps/nss_pillar.yml b/Resources/Maps/nss_pillar.yml index 36ee41147b..c289b573ec 100644 --- a/Resources/Maps/nss_pillar.yml +++ b/Resources/Maps/nss_pillar.yml @@ -1179,7 +1179,7 @@ entities: Toggle: [] type: SignalReceiver - uid: 110 - type: BoxSterile + type: BoxSterileMask components: - pos: 2.6051922,-12.398874 parent: 130 @@ -73701,7 +73701,7 @@ entities: parent: 130 type: Transform - uid: 5650 - type: BoxLatex + type: BoxLatexGloves components: - pos: 21.30173,-25.393604 parent: 130 @@ -109963,7 +109963,7 @@ entities: ents: [] type: ContainerContainer - uid: 8755 - type: BoxSterile + type: BoxSterileMask components: - pos: 21.86423,-25.393604 parent: 130 @@ -151337,7 +151337,7 @@ entities: id: docking type: Fixtures - uid: 12721 - type: BoxSterile + type: BoxSterileMask components: - pos: 5.5165095,-21.370937 parent: 130 @@ -151353,7 +151353,7 @@ entities: parent: 130 type: Transform - uid: 12723 - type: BoxLatex + type: BoxLatexGloves components: - pos: 2.335823,-12.452833 parent: 130 @@ -151363,7 +151363,7 @@ entities: ents: [] type: ContainerContainer - uid: 12724 - type: BoxLatex + type: BoxLatexGloves components: - pos: 5.445194,-23.46559 parent: 130 diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index 40608eb628..3f77071d5f 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -128391,7 +128391,7 @@ entities: ents: [] type: ContainerContainer - uid: 12159 - type: BoxSterile + type: BoxSterileMask components: - pos: 79.63914,-6.4771976 parent: 2 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 61fc1c0a69..b004c643bd 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -235,7 +235,7 @@ entities: parent: 852 type: Transform - uid: 9 - type: BoxLatex + type: BoxLatexGloves components: - pos: 21.584303,-4.310457 parent: 852 @@ -541,7 +541,7 @@ entities: ents: [] type: ContainerContainer - uid: 45 - type: BoxSterile + type: BoxSterileMask components: - pos: 21.350922,-4.296852 parent: 852 @@ -74358,7 +74358,7 @@ entities: ents: [] type: ContainerContainer - uid: 7116 - type: BoxLatex + type: BoxLatexGloves components: - pos: 13.500268,-13.486635 parent: 852 diff --git a/Resources/Maps/splitstation.yml b/Resources/Maps/splitstation.yml index 90065fc806..ab08722613 100644 --- a/Resources/Maps/splitstation.yml +++ b/Resources/Maps/splitstation.yml @@ -36895,7 +36895,7 @@ entities: - fixtures: [] type: Fixtures - uid: 1234 - type: BoxLatex + type: BoxLatexGloves components: - pos: -41.5,-34.5 parent: 69 @@ -39262,7 +39262,7 @@ entities: parent: 69 type: Transform - uid: 1520 - type: BoxLatex + type: BoxLatexGloves components: - pos: -47.5,-19.5 parent: 69 @@ -68056,7 +68056,7 @@ entities: ents: [] type: ContainerContainer - uid: 4949 - type: BoxSterile + type: BoxSterileMask components: - pos: -39.604656,-6.562555 parent: 69 @@ -69950,7 +69950,7 @@ entities: ents: [] type: ContainerContainer - uid: 5215 - type: BoxSterile + type: BoxSterileMask components: - pos: -47.5,-18.5 parent: 69 @@ -69967,7 +69967,7 @@ entities: parent: 69 type: Transform - uid: 5217 - type: BoxLatex + type: BoxLatexGloves components: - pos: -39.010906,-6.57818 parent: 69 @@ -110791,7 +110791,7 @@ entities: parent: 69 type: Transform - uid: 9789 - type: BoxSterile + type: BoxSterileMask components: - pos: -52.5,-5.5 parent: 69 @@ -119722,7 +119722,7 @@ entities: ents: [] type: ContainerContainer - uid: 10662 - type: BoxLatex + type: BoxLatexGloves components: - pos: 14.54175,-89.494385 parent: 69 @@ -120040,7 +120040,7 @@ entities: parent: 69 type: Transform - uid: 10702 - type: BoxSterile + type: BoxSterileMask components: - pos: 12.5,-98.5 parent: 69 @@ -120050,7 +120050,7 @@ entities: ents: [] type: ContainerContainer - uid: 10703 - type: BoxLatex + type: BoxLatexGloves components: - pos: 12.5,-99.5 parent: 69 @@ -135476,7 +135476,7 @@ entities: ents: [] type: ContainerContainer - uid: 12597 - type: BoxSterile + type: BoxSterileMask components: - pos: -12.5,-125.5 parent: 69 diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml index 5cf01265f5..543bdbb0aa 100644 --- a/Resources/Maps/waystation.yml +++ b/Resources/Maps/waystation.yml @@ -33919,7 +33919,7 @@ entities: ents: [] type: ContainerContainer - uid: 2240 - type: BoxLatex + type: BoxLatexGloves components: - pos: -8.579043,21.712063 parent: 82 @@ -33935,7 +33935,7 @@ entities: parent: 82 type: Transform - uid: 2242 - type: BoxSterile + type: BoxSterileMask components: - pos: -8.422793,21.805813 parent: 82 @@ -50403,7 +50403,7 @@ entities: ents: [] type: ContainerContainer - uid: 4157 - type: BoxSterile + type: BoxSterileMask components: - pos: 63.398205,4.583559 parent: 82 @@ -50413,7 +50413,7 @@ entities: ents: [] type: ContainerContainer - uid: 4158 - type: BoxLatex + type: BoxLatexGloves components: - pos: 63.64821,4.646059 parent: 82 @@ -51487,7 +51487,7 @@ entities: parent: 82 type: Transform - uid: 4285 - type: BoxLatex + type: BoxLatexGloves components: - pos: 69.62836,-3.3707879 parent: 82 @@ -52379,7 +52379,7 @@ entities: ents: [] type: ContainerContainer - uid: 4399 - type: BoxSterile + type: BoxSterileMask components: - pos: 75.50042,0.6692133 parent: 82 @@ -52446,7 +52446,7 @@ entities: parent: 82 type: Transform - uid: 4408 - type: BoxLatex + type: BoxLatexGloves components: - pos: 75.40667,0.5754633 parent: 82 @@ -57678,7 +57678,7 @@ entities: parent: 82 type: Transform - uid: 4910 - type: BoxLatex + type: BoxLatexGloves components: - pos: 87.512794,7.6604137 parent: 82 @@ -57688,7 +57688,7 @@ entities: ents: [] type: ContainerContainer - uid: 4911 - type: BoxSterile + type: BoxSterileMask components: - pos: 87.325294,7.6291637 parent: 82 @@ -58592,7 +58592,7 @@ entities: ents: [] type: ContainerContainer - uid: 5023 - type: BoxLatex + type: BoxLatexGloves components: - pos: 44.63998,-0.41317558 parent: 82 @@ -59377,7 +59377,7 @@ entities: - solution: bucket type: Drink - uid: 5119 - type: BoxLatex + type: BoxLatexGloves components: - pos: 32.504967,-11.409534 parent: 82 @@ -59423,7 +59423,7 @@ entities: parent: 82 type: Transform - uid: 5126 - type: BoxSterile + type: BoxSterileMask components: - pos: 35.629967,-10.378284 parent: 82 diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index 5ed4deb0b1..38c84cb8b4 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -29,9 +29,9 @@ - state: pillbox - type: entity - name: sterile box + name: sterile mask box parent: BoxCardboard - id: BoxSterile + id: BoxSterileMask description: This box contains sterile medical masks. components: - type: StorageFill @@ -44,9 +44,9 @@ - state: sterile - type: entity - name: latex box + name: latex gloves box parent: BoxCardboard - id: BoxLatex + id: BoxLatexGloves description: Contains sterile latex gloves. components: - type: StorageFill @@ -57,6 +57,21 @@ layers: - state: box - state: latex + +- type: entity + name: nitrile gloves box + parent: BoxCardboard + id: BoxNitrileGloves + description: Contains sterile nitrile gloves. Better than latex. + components: + - type: StorageFill + contents: + - id: ClothingHandsGlovesNitrile + amount: 4 + - type: Sprite + layers: + - state: box + - state: nitrile - type: entity name: mouth swab box diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index d59b411adc..a65b9a7044 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -19,9 +19,9 @@ amount: 2 - id: Gauze amount: 2 - - id: BoxLatex + - id: BoxLatexGloves amount: 1 - - id: BoxSterile + - id: BoxSterileMask amount: 1 - id: BoxMouthSwab amount: 1 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 7e8465ab1f..600f085c82 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -91,6 +91,9 @@ { "name": "mousetraps" }, + { + "name": "nitrile" + }, { "name": "pda" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png new file mode 100644 index 0000000000000000000000000000000000000000..f9a46ee99df434f34f6dfe4f0a81df4f017a0cfe GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}<(@8%ArY-_ zFYe}TFyLuN@<@YW^y`q9^vbm$mJ+nmBbl%Cp@a_y-0Hh5KNvKJMa5i z^P0G(bXMP7g9Ce5mhG_rJmu2s+FIX6p?kc_ug#bWo-rHmzBjF4?gER?2SvW;*DqjU kzWQ(-)4ki>9edF?80Z8BPgg&ebxsLQ08vgz!~g&Q literal 0 HcmV?d00001