]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Syndicate Decoy Bundle + Snap Pops (#25333)
authorFirewatch <54725557+musicmanvr@users.noreply.github.com>
Wed, 28 Feb 2024 21:53:46 +0000 (16:53 -0500)
committerGitHub <noreply@github.com>
Wed, 28 Feb 2024 21:53:46 +0000 (16:53 -0500)
commit93d820f315c015eca17444bb8459f96f57381acd
tree870e553849fe1e4351e103e3e43397bc77f73c1d
parent98843511014e1b5fce34b7e1215179dd3d0f94c8
Syndicate Decoy Bundle + Snap Pops (#25333)

* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake

:star:

* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy :+1:

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
42 files changed:
Resources/Audio/Items/Whistle/attributions.yml
Resources/Audio/Items/Whistle/trench_whistle_1.ogg [new file with mode: 0644]
Resources/Audio/Items/Whistle/trench_whistle_2.ogg [new file with mode: 0644]
Resources/Audio/Items/Whistle/trench_whistle_3.ogg [new file with mode: 0644]
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Fun/whistles.yml
Resources/Prototypes/Entities/Objects/Tools/decoys.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
Resources/Prototypes/SoundCollections/whistle.yml
Resources/Prototypes/tags.yml
Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tools/greenlight.rsi/meta.json [new file with mode: 0644]