diff --git a/Resources/Audio/_Sunrise/Misc/petard.ogg b/Resources/Audio/_Sunrise/Misc/petard.ogg new file mode 100644 index 0000000000..2610e80e84 Binary files /dev/null and b/Resources/Audio/_Sunrise/Misc/petard.ogg differ diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/throwable/firecrackers.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/throwable/firecrackers.ftl new file mode 100644 index 0000000000..2d68b806cb --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/throwable/firecrackers.ftl @@ -0,0 +1,6 @@ +ent-FirecrackerBundle = связка хлопушек + .desc = Яркая связка хлопушек с запахом дешёвого пластика. +ent-Firecracker = хлопушка + .desc = Красная хлопушка, издающая громкий звук при броске. +ent-FirecrackerBox = коробка хлопушек + .desc = Красочная коробка, полная праздничных хлопушек. \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml index 3c34277341..d5aa2b9be5 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/hohohonkers.yml @@ -6,3 +6,5 @@ ToySwordDoubled: 2 FaketAnomalyIceFlatpack: 2 ClusterSyndyFlashGrenade: 5 + FirecrackerBundle: 4 + FirecrackerBox: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Throwable/firecrackers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Throwable/firecrackers.yml new file mode 100644 index 0000000000..aabceeac9b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Throwable/firecrackers.yml @@ -0,0 +1,85 @@ +- type: entity + parent: ScatteringGrenadeBase + id: FirecrackerBundle + name: firecracker bundle + description: This item emits a pungent smell of cheap plastic. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: ScatteringGrenade + capacity: 10 + fillPrototype: Firecracker + distance: 3 + - type: OnUseTimerTrigger # todo: make it activate through welder/lighter/fire instead + delay: 5 + examinable: false + initialBeepDelay: 0 + beepSound: /Audio/Effects/lightburn.ogg + - type: TimerTriggerVisuals + - type: RandomTimerTrigger + min: 1 + max: 10 + - type: ExplodeOnTrigger + +- type: entity + parent: BaseItem + id: Firecracker + name: firecracker + description: This item emits a pungent smell of cheap plastic. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi + state: icon + - type: Item + size: Tiny + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/_Sunrise/Misc/petard.ogg + params: + variation: 0.2 + - !type:ExplodeBehavior + - type: DamageOnLand + damage: + types: + Blunt: 3 + - type: Explosive + explosionType: Default + maxIntensity: 0.01 + intensitySlope: 1 + totalIntensity: 0.01 + +- type: entity + parent: BaseStorageItem + id: FirecrackerBox + name: firecrackers box + description: Contains firecrackers for a New Year's mood. + components: + - type: Item + size: Normal + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi + state: box + - type: Storage + grid: + - 0,0,4,3 + areaInsert: true + maxItemSize: Tiny + - type: StorageFill + contents: + - id: Firecracker + amount: 10 + - type: Dumpable + diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/icon.png new file mode 100644 index 0000000000..6eb5407d19 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/meta.json new file mode 100644 index 0000000000..4e405e9fc9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/clusterpetard.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Sunrise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/box.png b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/box.png new file mode 100644 index 0000000000..7f0e19abb5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/box.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/meta.json new file mode 100644 index 0000000000..5f9c5fa212 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/firecrackerbox.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Sunrise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/icon.png new file mode 100644 index 0000000000..500f55be47 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/meta.json new file mode 100644 index 0000000000..4e405e9fc9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Grenades/fireworkpetard.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Sunrise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file