Merge pull request #99 from Vault-Overseers/master

Доапстрим на 1 коммит

Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml

@@ -41,4 +41,48 @@
           collection: WoodDestroy
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-        # N14TODO: Needs inhands sprites
+        # N14TODO: Needs inhands sprites
+
+  #BoS Flagpole
+- type: entity
+  parent: BaseItem
+  id: N14DecorationFlagpoleBOS
+  name: BoS flag pole
+  description: A Midwest Brotherhood flag on a wooden pole.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi
+    state: icon
+    noRot: true
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 10
+        Structural: 5
+    soundHit:
+      collection: MetalThud
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 5
+        Structural: 10
+  - type: Item
+    size: Huge
+  - type: UseDelay
+    delay: 1
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]

Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml

@@ -293,4 +293,25 @@
   - type: Sprite
     state: junk_clock
     drawdepth: Overdoors
-  - type: WallMount
+  - type: WallMount
+
+#Tires
+- type: entity
+  parent: N14JunkMetalBase #for the moment
+  id: N14JunkStackedTires
+  name: stack of tires
+  description: A stack of old, unusable tires.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Structures/Decoration/tires.rsi
+    state: stackedtires
+
+- type: entity
+  parent: N14JunkMetalBase #for the moment
+  id: N14JunkGroundTires
+  name: a pile of tires
+  description: A pile of old, unusable tires spread on the ground.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Structures/Decoration/tires.rsi
+    state: groundtires

Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json

@@ -4,11 +4,11 @@
   "copyright": "made by ladyayla for Nuclear 14",
   "size": {
       "x": 32,
-      "y": 64
+      "y": 32
   },
   "states": [
     {
-      "name": "midwestflagpole"
+      "name": "icon"
     }
   ]
 }

Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Created by ladyayla and MaxxOrion for N14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "groundtires"
+    },
+    {
+      "name": "stackedtires"
+    }
+  ]
+}