diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 83d7a601db..60c764eef5 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -152,6 +152,7 @@ - Flash - Handcuffs - Stunbaton + - FlashPayload - type: technology name: "non-lethal technology" diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml index 331924e5a2..86575c8563 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml @@ -76,3 +76,19 @@ enum.ChemicalPayloadFilledSlots.Left: payload-chemical-left enum.ChemicalPayloadFilledSlots.Right: payload-chemical-right enum.ChemicalPayloadFilledSlots.Both: payload-chemical-armed + +- type: entity + name: flash payload + parent: BasePayload + id: FlashPayload + description: A single-use flash payload. + components: + - type: Sprite + sprite: Objects/Devices/payload.rsi + state: payload-flash-armed + - type: DeleteOnTrigger + - type: FlashOnTrigger + range: 6 + - type: EmitSoundOnTrigger + sound: + path: "/Audio/Effects/flash_bang.ogg" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 25edf036d7..c290c2d87e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -192,6 +192,7 @@ - FlashlightLantern - TimerTrigger - ChemicalPayload + - FlashPayload - type: ActivatableUI key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything - type: ActivatableUIRequiresPower diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index b3cf8e9516..4ccbce8580 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -19,3 +19,16 @@ materials: Steel: 200 Plastic: 300 + +- type: latheRecipe + id: FlashPayload + icon: + sprite: Objects/Devices/payload.rsi + state: payload-flash-armed + result: FlashPayload + completetime: 1 + materials: + Steel: 50 + Plastic: 100 + Glass: 50 + #one fourth of what making a flash would cost diff --git a/Resources/Textures/Objects/Devices/payload.rsi/meta.json b/Resources/Textures/Objects/Devices/payload.rsi/meta.json index 7f1958955b..74eee1d86f 100644 --- a/Resources/Textures/Objects/Devices/payload.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/payload.rsi/meta.json @@ -30,6 +30,11 @@ "name": "payload-explosive-armed", "directions": 1, "delays": [ [ 0.2, 0.2, 0.2 ] ] + }, + { + "name": "payload-flash-armed", + "directions": 1, + "delays": [ [ 0.2, 0.2, 0.2 ] ] } ] } diff --git a/Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png b/Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png new file mode 100644 index 0000000000..13215e53dc Binary files /dev/null and b/Resources/Textures/Objects/Devices/payload.rsi/payload-flash-armed.png differ