Merge branch 'master' into 2020-08-19-firelocks

2020-09-07 12:47:52 +02:00
parent c3858e6151 47554f99f0
commit da4d08432d
28 changed files with 979 additions and 289 deletions
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -185,22 +185,6 @@
    highPressureMultiplier: 0.45
    lowPressureMultiplier: 100

- type: entity
-  parent: HardsuitBase
-  id: Spacesuit
-  name: spacesuit
-  description: A basic space suit.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/space.rsi
-  - type: Icon
-    sprite: Clothing/OuterClothing/space.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/space.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 1
-    lowPressureMultiplier: 100
-
 # I don't know what the hell "td" is but whatever i'll dump it here.
 - type: entity
  parent: HardsuitBase
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: LockerQuarterMaster
  parent: LockerSecureBase
-  name: "quatermaster's locker"
+  name: "quartermaster's locker"
  components:
  - type: Appearance
    visuals: