smartfridge semi functional (#22443)

* smartfridge

* leftovers from when it was powered

* real

diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
new file mode 100644 (file)
index 0000000..95ce0b9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -0,0 +1,94 @@
+- type: entity
+  parent: BaseStructureDynamic
+  id: SmartFridge
+  name: SmartFridge
+  description: A refrigerated storage unit for keeping items cold and fresh.
+  components:
+  - type: Advertise
+    pack: SmartFridgeAds
+  - type: Speech
+  - type: Appearance
+  - type: Sprite
+    sprite: Structures/Machines/smartfridge.rsi
+    snapCardinals: true
+    layers:
+    - state: smartfridge
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: smartfridge_door
+      map: ["enum.StorageVisualLayers.Door"]
+      shader: unshaded
+  - type: EntityStorageVisuals
+    stateBaseClosed: smartfridge
+    stateDoorOpen: smartfridge_open
+    stateDoorClosed: smartfridge_door
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#9dc5c9"
+  - type: EntityStorage
+    isCollidableWhenOpen: true
+    closeSound:
+      path: /Audio/Machines/windoor_open.ogg
+      params:
+        volume: -3
+    openSound:
+      path: /Audio/Machines/windoor_open.ogg
+      params:
+        volume: -3
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+  - type: UseDelay
+    delay: 1
+  - type: AntiRottingContainer
+  - type: ResistLocker
+  - type: Physics
+    bodyType: Static
+  - type: Transform
+    noRot: true
+    anchored: True
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+        density: 200
+  - type: Anchorable
+    delay: 2
+  - type: InteractionOutline
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/metalbreak.ogg
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: DamageOnHighSpeedImpact
+    damage:
+      types:
+        Blunt: 5
+    soundHit:
+      path: /Audio/Effects/bang.ogg

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index e7b3fb57fc47e3d005e40734902f2ec766b4ee1b..fa8ae6f7a47b585bba8fe00de9aab1047f2f8607 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -891,37 +891,6 @@
   - type: AccessReader
     access: [["Hydroponics"]]
 
-- type: entity
-  parent: VendingMachine
-  id: VendingMachineSmartFridge
-  name: SmartFridge
-  description: A refrigerated storage unit for keeping items cold and fresh.
-  components:
-  - type: VendingMachine
-    pack: SmartFridgeInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    denyState: deny-unshaded
-    loopDeny: false
-  - type: Advertise
-    pack: SmartFridgeAds
-  - type: Speech
-  - type: Sprite
-    sprite: Structures/Machines/VendingMachines/smartfridge.rsi
-    layers:
-    - state: off
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: off
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#9dc5c9"
-
 - type: entity
   parent: VendingMachine
   id: VendingMachineSnack
@@ -2034,4 +2003,4 @@
     ejectDelay: 2
   - type: AccessReader
     access: [["SyndicateAgent"]]
-  
+

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
deleted file mode 100644 (file)
index c81ec5a..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
deleted file mode 100644 (file)
index 92b8160..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
deleted file mode 100644 (file)
index 6faae75..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
deleted file mode 100644 (file)
index 0a0a4a7..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
deleted file mode 100644 (file)
index 4a81949..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
deleted file mode 100644 (file)
index 2fdeb90..0000000
--- a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "fill-0"
-    },
-    {
-      "name": "fill-1"
-    },
-    {
-      "name": "fill-2"
-    },
-    {
-      "name": "fill-3"
-    },
-    {
-      "name": "broken"
-    },
-    {
-      "name": "deny-unshaded",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "normal-unshaded",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "on"
-    },
-    {
-      "name": "off"
-    },
-    {
-      "name": "panel"
-    }
-  ]
-}

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
deleted file mode 100644 (file)
index 3ef5448..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
deleted file mode 100644 (file)
index 334c74d..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
deleted file mode 100644 (file)
index 057b8b3..0000000
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png and /dev/null differ

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png b/Resources/Textures/Structures/Machines/smartfridge.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png
rename to Resources/Textures/Structures/Machines/smartfridge.rsi/broken.png

diff --git a/Resources/Textures/Structures/Machines/smartfridge.rsi/meta.json b/Resources/Textures/Structures/Machines/smartfridge.rsi/meta.json
new file mode 100644 (file)
index 0000000..309594f
--- /dev/null
+++ b/Resources/Textures/Structures/Machines/smartfridge.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept, modified by emisse for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "smartfridge_open"
+    },
+    {
+      "name": "smartfridge"
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "broken"
+    },
+    {
+      "name": "smartfridge_door"
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png b/Resources/Textures/Structures/Machines/smartfridge.rsi/off.png
similarity index 100%
rename from Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png
rename to Resources/Textures/Structures/Machines/smartfridge.rsi/off.png

diff --git a/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge.png b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge.png
new file mode 100644 (file)
index 0000000..ced744c
Binary files /dev/null and b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge.png differ

diff --git a/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_door.png b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_door.png
new file mode 100644 (file)
index 0000000..a0e9999
Binary files /dev/null and b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_door.png differ

diff --git a/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_open.png b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_open.png
new file mode 100644 (file)
index 0000000..a43b416
Binary files /dev/null and b/Resources/Textures/Structures/Machines/smartfridge.rsi/smartfridge_open.png differ

diff --git a/Resources/migration.yml b/Resources/migration.yml
index a8f09ea0428c5968af5d0636cdb7f7b095e9dbe1..3c1dc2dac6a75061d4d4b72fb7cefe0f7ecb42a9 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -97,3 +97,6 @@ SpawnPointSeniorPhysician: null
 # 2023-12-12
 #No this is not the CMO hardsuit, their prototype IDs were just confusingly similar
 ClothingOuterHardsuitMedic: ClothingOuterHardsuitSyndieMedic
+
+# 2023-12-13
+VendingMachineSmartFridge: SmartFridge