diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml index d19cdc35347..589854a01a6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml @@ -41,4 +41,48 @@ collection: WoodDestroy - !type:DoActsBehavior acts: [ "Destruction" ] - # N14TODO: Needs inhands sprites \ No newline at end of file + # 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" ] \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml index 95bb7376fdc..e2265672492 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml @@ -293,4 +293,25 @@ - type: Sprite state: junk_clock drawdepth: Overdoors - - type: WallMount \ No newline at end of file + - 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 \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/midwestflagpole.png b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png similarity index 100% rename from Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/midwestflagpole.png rename to Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json index 9f34352fe1a..63cfc9d1b9c 100644 --- a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json +++ b/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" } ] } diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png new file mode 100644 index 00000000000..2ba781f193c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json new file mode 100644 index 00000000000..14b3bbc98ed --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png new file mode 100644 index 00000000000..c5b84846d1b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png differ