From b9b074fd0c54ec2adc52c68a0b439d9e1a05d0e6 Mon Sep 17 00:00:00 2001 From: SimpleStation14 Date: Fri, 3 May 2024 11:59:01 -0400 Subject: [PATCH 1/2] Cherry-picked commit 55ad9c7e433ebd0f58229157d2d7fd766b268ee4 from space-wizards/space-station-14/master --- .../Catalog/Fills/Boxes/service.yml | 14 +++++++++ .../Catalog/Fills/Crates/service.yml | 3 +- .../Prototypes/Catalog/Fills/Items/belt.yml | 4 +-- .../Entities/Clothing/Belt/belts.yml | 1 + .../Objects/Weapons/Throwable/grenades.yml | 17 +++++++++++ .../Grenades/janitor.rsi/equipped-BELT.png | Bin 0 -> 232 bytes .../Weapons/Grenades/janitor.rsi/icon.png | Bin 0 -> 383 bytes .../Weapons/Grenades/janitor.rsi/meta.json | 27 ++++++++++++++++++ .../Weapons/Grenades/janitor.rsi/primed.png | Bin 0 -> 441 bytes 9 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Boxes/service.yml create mode 100644 Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml new file mode 100644 index 00000000000..37bb6b81a2f --- /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 \ No newline at end of file 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 0000000000000000000000000000000000000000..af09cd7fa6bdd19837cec0fda2d0ca0dda6b43f6 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7J0fjhE&XX zdut=-p#Txq3(Gl_wnbU>{xNLnnPA0z3l^vk>Xg|9bXsw-y(nZdyD!(KAF@yh!Tb2e>b>ef}r*4}V~NvUWXQ|9l6oi~Br aIG_>VVQVIOqa%4LNV%u0pUXO@geCwz2U$P> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..736e979dbb8eb54ee57419466c529396bd7fa82b GIT binary patch literal 383 zcmV-_0f7FAP)Px$IY~r8R9J=WmAgs)TSDPCg#<> zs4pSJ^uv6hU&f8PE7BU0m~WIy1Yw9D1OR-r+W=Y;B5?qKAPfOWr&2hMgHlQ&0~idU z9|X9ri&Bb8Isf|s0OB~NQqJSOJc%_Dx8S?adO4d#Db+LYM&baX3QVo9aocPHaCG^I z|NbcskeIFG6J2|I(C4jteNeyFxk6E!+yhYsJl%Wo#Nr&Qr-zKq&Pe@bYY6b%?T~pr z1FyyAF2KHas~3syfT#kKojVpH7l6$CxJ1G%0KmxbH0jYLBXbb`1uNS-KZfq6b|uoX dSS*%5=L;SnW#@?Exhwzx002ovPDHLkV1gdcp%DN8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a687c07632138f82cce3548a064d3a16d2e18714 GIT binary patch literal 441 zcmV;q0Y?6bP)Px$b4f%&RA_?K@>)hj-r?pR)P`)1w}hCizya@ofySJtZZz2fq>RF+Smkq z0)JXb;{ya1QYeWJU|}KJ2x?4rO$;Vu5wWq#&5%W%)9*bWmv43kEEbE!VzEeY+@$`u ze#cGfLg7+}6~b|o`gz+4&Ho)DG`S&vk125>?}=uG?eCMwS5hhbAfV#=0KC^~0JtYdrz0-RtZy(|Szs|q5f1tCkclx+= zt9SAj+HsRzeTOM7Q0 zU3(0f@{1ZUTEAhY>H!d&9+r&g2$O#CH8{{ePIPdtBY7v7@{20Fu)gu*r*oA(?^^xC j_FF6#i^XEG{0Tk*+eXczA7c)Q00000NkvXXu0mjfqd~vV literal 0 HcmV?d00001 From d37a86fb00d0bbd855214b0c98df034d2a9d2808 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Fri, 10 May 2024 22:34:05 +0100 Subject: [PATCH 2/2] Update Resources/Prototypes/Catalog/Fills/Boxes/service.yml --- Resources/Prototypes/Catalog/Fills/Boxes/service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml index 37bb6b81a2f..99c256520d5 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml @@ -11,4 +11,4 @@ - type: Sprite layers: - state: box - - state: flashbang \ No newline at end of file + - state: flashbang