]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Uplink: Combat Bakery Kit (#31179)
authorthemias <89101928+themias@users.noreply.github.com>
Mon, 19 Aug 2024 18:57:29 +0000 (14:57 -0400)
committerGitHub <noreply@github.com>
Mon, 19 Aug 2024 18:57:29 +0000 (12:57 -0600)
commit6ba7d268b0918a4e3dc3dd0aa65d00d73319c79e
tree4c297c2735d78c9c7337dc081bbcacb5f8b614f3
parented34e4cbcd8db02ef7c9f32bd5f5c23cf7bea782
Uplink: Combat Bakery Kit (#31179)

* save

* sprites

* mime survival kit has baguette

* add weapon/uplink

* cherry-pick croissant changes

* uplink

* Switch baguette to slashing damage

* fixes

* update attribution

* fix typos

* review comments

* reduce TC cost

* switch to regular box

* fix regular baguette rotation
19 files changed:
Resources/Locale/en-US/preferences/loadout-groups.ftl
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml [new file with mode: 0644]
Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
Resources/Prototypes/Loadouts/loadout_groups.yml
Resources/Prototypes/Loadouts/role_loadouts.yml
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json
Resources/Textures/Objects/Storage/boxes.rsi/france.png [new file with mode: 0644]
Resources/Textures/Objects/Storage/boxes.rsi/meta.json