juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607)

Browse Source 
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
This commit is contained in:
Peptide90
2022-06-04 06:05:18 +01:00
committed by GitHub
parent e06cabecbb
commit 79c265efb3
15 changed files with 75 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Maps/atlas.yml
View File

@@ -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

8
Resources/Maps/bagel.yml
View File

@@ -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

4
Resources/Maps/barratry.yml
View File

@@ -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

8
Resources/Maps/delta.yml
View File

@@ -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

8
Resources/Maps/marathon.yml
View File

@@ -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

6
Resources/Maps/moose.yml
View File

@@ -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

12
Resources/Maps/nss_pillar.yml
View File

@@ -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

2
Resources/Maps/packedstation.yml
View File

@@ -128391,7 +128391,7 @@ entities:
ents: []
type: ContainerContainer
- uid: 12159
type: BoxSterile
type: BoxSterileMask
components:
- pos: 79.63914,-6.4771976
parent: 2

6
Resources/Maps/saltern.yml
View File

@@ -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

20
Resources/Maps/splitstation.yml
View File

@@ -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

24
Resources/Maps/waystation.yml
View File

@@ -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

23
Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
View File

@@ -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

4
Resources/Prototypes/Catalog/Fills/Crates/medical.yml
View File

@@ -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

3
Resources/Textures/Objects/Storage/boxes.rsi/meta.json
View File

@@ -91,6 +91,9 @@
{
"name": "mousetraps"
},
{
"name": "nitrile"
},
{
"name": "pda"
},

BIN
Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 189 B