bonfire and mattress (#15871)

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
new file mode 100644 (file)
index 0000000..7d3bef8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -0,0 +1,36 @@
+- type: entity
+  id: Bonfire
+  parent: BaseStructure
+  name: bonfire
+  description: What can be better then late evening under the sky with guitar and friends.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Decoration/bonfire.rsi
+    state: burning
+  - type: PointLight
+    radius: 5
+    energy: 3
+    color: "#FFC90C"
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 50
+        behaviors:
+          - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: LegionnaireBonfire
+  parent: Bonfire
+  name: legionnaire bonfire
+  description: There, in the land of lava and ash, place to to cook marshmallow and potato.
+  components:
+  - type: Sprite
+    state: legionnaire_bonfire
+  - type: PointLight
+    color: "#FF5601"

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 707ce31db9fab0f1f80e8a85a2491c7e0010df4b..5b83ddba89fa92e07865d91b3292a7641d432f2a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -111,3 +111,14 @@
           MaterialWoodPlank:
             min: 1
             max: 5
+
+- type: entity
+  parent: Bed
+  id: Mattress
+  name: mattress
+  description: Better sleep in that then on the floor i guess.
+  components:
+  - type: Sprite
+    state: mattress
+  - type: Damageable
+    damageModifierSet: Inflatable

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png
new file mode 100644 (file)
index 0000000..81418d8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png differ

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png
new file mode 100644 (file)
index 0000000..f0600a8
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png differ

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png
new file mode 100644 (file)
index 0000000..4f5e2fc
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png differ

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/legionnaire_bonfire.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/legionnaire_bonfire.png
new file mode 100644 (file)
index 0000000..6652452
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/bonfire.rsi/legionnaire_bonfire.png differ

diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json b/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json
new file mode 100644 (file)
index 0000000..bfa6011
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from /tg/station at commit 28b476ab6d17014e6f9e18a748d7c96be28de9a1",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bonfire_0"
+    },
+    {
+      "name": "bonfire_1"
+    },
+    {
+      "name": "burning",
+      "delays": [
+        [
+      0.3,
+      0.3,
+      0.3
+    ]
+      ]
+    },
+    {
+      "name": "legionnaire_bonfire",
+      "delays": [
+        [
+      0.3,
+      0.3,
+      0.3
+    ]
+      ]
+    }
+  ]
+}