diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml new file mode 100644 index 00000000000..99c256520d5 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml @@ -0,0 +1,14 @@ +- type: entity + name: cleanades box + parent: BoxCardboard + id: BoxCleanerGrenades + description: A box full of cleanades. + components: + - type: StorageFill + contents: + - id: CleanerGrenade + amount: 4 + - type: Sprite + layers: + - state: box + - state: flashbang diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 8f8c1a114fc..141f98edab2 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -19,7 +19,8 @@ amount: 2 - id: Plunger amount: 2 - + - id: BoxCleanerGrenades + - type: entity id: CrateServiceReplacementLights parent: CrateGenericSteel diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 976d2a4307f..27dd4c7e9a7 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -63,8 +63,8 @@ contents: - id: Soap #Make a soap group and pick between when i'm not lazy - id: SprayBottleSpaceCleaner - #- name: GrenadeChem - #- name: GrenadeChem + - id: CleanerGrenade + amount: 2 - id: FlashlightLantern - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index b84033a7874..30d3f8a0ab7 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -223,6 +223,7 @@ - Plunger components: - LightReplacer + - SmokeOnTrigger maxItemSize: Large - type: ItemMapper mapLayers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 326fd41acab..274257da943 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -364,6 +364,23 @@ primingSound: path: /Audio/Effects/Smoke-grenade.ogg +- type: entity + parent: SmokeGrenade + id: CleanerGrenade + name: cleanade + description: Special grenade for janitors, releasing large cloud of space cleaner foam + components: + - type: Sprite + sprite: Objects/Weapons/Grenades/janitor.rsi + - type: SmokeOnTrigger + duration: 15 + spreadAmount: 50 + smokePrototype: Foam + solution: + reagents: + - ReagentId: SpaceCleaner + Quantity: 30 + - type: entity parent: SmokeGrenade id: TearGasGrenade diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png new file mode 100644 index 00000000000..af09cd7fa6b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png new file mode 100644 index 00000000000..736e979dbb8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json new file mode 100644 index 00000000000..28d3e6969a9 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png new file mode 100644 index 00000000000..a687c076321 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png differ