Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mirror: Cleaner Grenade #385

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Boxes/service.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
amount: 2
- id: Plunger
amount: 2

- id: BoxCleanerGrenades

- type: entity
id: CrateServiceReplacementLights
parent: CrateGenericSteel
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
- Plunger
components:
- LightReplacer
- SmokeOnTrigger
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
maxItemSize: Large
- type: ItemMapper
mapLayers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading