From 7a9adffa1e406bcb615b9968f4a960d69cb69b2b Mon Sep 17 00:00:00 2001 From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com> Date: Sat, 29 Apr 2023 08:52:58 +0300 Subject: [PATCH] bonfire and mattress (#15871) --- .../Structures/Decoration/bonfire.yml | 36 +++++++++++++++++ .../Entities/Structures/Furniture/beds.yml | 11 ++++++ .../Decoration/bonfire.rsi/bonfire_0.png | Bin 0 -> 652 bytes .../Decoration/bonfire.rsi/bonfire_1.png | Bin 0 -> 1035 bytes .../Decoration/bonfire.rsi/burning.png | Bin 0 -> 2049 bytes .../bonfire.rsi/legionnaire_bonfire.png | Bin 0 -> 842 bytes .../Decoration/bonfire.rsi/meta.json | 37 ++++++++++++++++++ 7 files changed, 84 insertions(+) create mode 100644 Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml create mode 100644 Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_0.png create mode 100644 Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire_1.png create mode 100644 Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png create mode 100644 Resources/Textures/Structures/Decoration/bonfire.rsi/legionnaire_bonfire.png create mode 100644 Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml new file mode 100644 index 0000000000..7d3bef8e50 --- /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 707ce31db9..5b83ddba89 100644 --- 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 index 0000000000000000000000000000000000000000..81418d83ee025ccde90364726cd93ccaa12697ea GIT binary patch literal 652 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 YLMMtS`0B3&>vj6}9 literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..6652452abec16383485804aed70ee4359ea460f4 GIT binary patch literal 842 zcmV-Q1GW5#P);}mdUtb2MMJzpK=KX^|H%&jRsk+8EB|x>rzsS@I3C+lG-EWUD*ylh4|Gya zQvm<}|NsC0|NsC0|NsC0<&B=E0008LNklxw`_<* zNM}0m7K zSMC${69@1vj|h)CGmiuJjr%KJ%uE|a@l=jM?0Cd)+*6);tzAR;R1OL=4~t)UeeJ;9 zWWk^LYX=*LgF}WBM+UDmbXzFkW`__a9_gSwbH8(Lj+wLOpjgfbm>_>-D`p;X=Ye14 zz`b*r@jYktm=jXhY!UYxmwm@$;&$XU+dNu4@l;^ZYTp=q&Zo%$7Ixh1nMdF&xIFAX zcvd$#L*w?%gx@)Ye5msC#503P551Zjhl0?qSXP1gVjNs@8hmhfB}Y`OgqolqGiL>{ z$hshI^_fFK85H+-2hB~PE{_P6{U@)&KvCx-&(?yc1Fnc~9R8Sq(i0-ZeaJMWk3r{} z9DP7=3=fg{;+Dw`QE-xD5t?wup@ zJugdF=use9LH$;}JHl&MpUP9He|6N|-Va#(KcdX;-{zU=PD=SKzvPljF1h5AOD?(Ol1nc657fOb U9U}o8B>(^b07*qoM6N<$f~3rrUjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json b/Resources/Textures/Structures/Decoration/bonfire.rsi/meta.json new file mode 100644 index 0000000000..bfa6011fdd --- /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 + ] + ] + } + ] +} -- 2.51.2