makes closets/lockers better (#24942)

* hmngm

* fix

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 7ab24f6b5ca7e67f6244a6647a2c22b2f58a0ffb..783bec3ba0da256ce00b5ce0e899c27443e74e43 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -44,6 +44,11 @@
           SheetSteel1:
             min: 1
             max: 2
+  - type: Construction
+    graph: ClosetSteel
+    node: done
+    containers:
+    - entity_storage
 
 - type: entity
   id: LockerBaseSecure
@@ -61,3 +66,8 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: Construction
+    graph: ClosetSteelSecure
+    node: done
+    containers:
+    - entity_storage

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 0207a8977ba485bedf1b40d1537c40e60dcbaec1..89dc4d47552454d2dbf71cdcb3447d1438917098 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -18,6 +18,18 @@
     openSound:
       path: /Audio/Effects/woodenclosetopen.ogg
 
+# Basic
+- type: entity
+  id: LockerSteel
+  parent: LockerBaseSecure
+  name: secure closet
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: secure
+    stateDoorOpen: secure_open
+    stateDoorClosed: secure_door
+
 # Cargo
 - type: entity
   id: LockerQuarterMaster

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 66647d168f63a5710d324b0053c909e7ac8cc2aa..0ef99b9f47ea29790871ac2768c37c2b547bd925 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -171,6 +171,11 @@
           SheetSteel1:
             min: 1
             max: 1
+  - type: Construction
+    graph: ClosetWall
+    node: done
+    containers:
+    - entity_storage
 
 #Wall locker
 - type: entity

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
index 5b0cc1f9a2e71ed7fadc0a24c46d22efc0f009a3..e72c56ff44c35cb878c3fd45ae7203322c5a76f9 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
@@ -25,3 +25,66 @@
         amount: 4
       - !type:EmptyAllContainers
       - !type:DeleteEntity
+
+- type: constructionGraph
+  id: ClosetSteelSecure
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: done
+      steps:
+      - material: Steel
+        amount: 4
+      - material: Cable
+        amount: 2
+        doAfter: 5
+  - node: done
+    entity: LockerSteel
+    edges:
+    - to: start
+      steps:
+      - tool: Screwing
+        doAfter: 5
+      conditions:
+      - !type:StorageWelded
+        welded: false
+      - !type:Locked
+        locked: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 4
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 2
+      - !type:EmptyAllContainers
+      - !type:DeleteEntity
+
+- type: constructionGraph
+  id: ClosetWall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: done
+      steps:
+      - material: Steel
+        amount: 4
+        doAfter: 5
+  - node: done
+    entity: ClosetWall
+    edges:
+    - to: start
+      steps:
+      - tool: Screwing
+        doAfter: 5
+      conditions:
+      - !type:StorageWelded
+        welded: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 4
+      - !type:EmptyAllContainers
+      - !type:DeleteEntity

diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml
index 09469093f773c253ecd7226ee9b6440b29bbc9af..21a7ec8225dbc6b6a8bcfdcfacbfdfed391ac48f 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml
@@ -8,3 +8,30 @@
   description: A tall steel box that cannot be locked.
   icon: { sprite: Structures/Storage/closet.rsi, state: generic_icon }
   objectType: Structure
+
+- type: construction
+  id: ClosetSteelSecure
+  name: secure closet
+  graph: ClosetSteelSecure
+  startNode: start
+  targetNode: done
+  category: construction-category-storage
+  description: A tall steel box that can be locked.
+  icon: { sprite: Structures/Storage/closet.rsi, state: secure_icon }
+  objectType: Structure
+
+- type: construction
+  id: ClosetWall
+  name: wall closet
+  graph: ClosetWall
+  startNode: start
+  targetNode: done
+  category: construction-category-storage
+  description: A standard-issue Nanotrasen storage unit, now on walls.
+  icon: { sprite: Structures/Storage/wall_locker.rsi, state: generic_icon }
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
\ No newline at end of file

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 98bbe8085a258430e94067c112891a1432b50e35..cf0c204447be01a336f1df5ca818bc4db0cd485b 100644 (file)
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -461,6 +461,9 @@
     {
       "name": "secure_door"
     },
+    {
+      "name": "secure_icon"
+    },
     {
       "name": "secure_open"
     },

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png
new file mode 100644 (file)
index 0000000..03b98c6
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png differ

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png
new file mode 100644 (file)
index 0000000..63e9dcb
Binary files /dev/null and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png differ

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
index 3408841645d15c12afde4bb03df038e7236b248b..b6ed63c7a3ed38733c7ae7a56bdc11da2f935b5a 100644 (file)
--- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
@@ -18,6 +18,7 @@
     { "name": "fire_open" },
     { "name": "generic" },
     { "name": "generic_door" },
+    { "name": "generic_icon" },
     { "name": "generic_open" },
     { "name": "gray_door" },
     { "name": "green_door" },