]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a80b31e) | patch
Add Offset Canes + Trinket Canes Group (#39272)
authorMora <46364955+TrixxedHeart@users.noreply.github.com>
Mon, 4 Aug 2025 23:39:40 +0000 (15:39 -0800)
committerGitHub <noreply@github.com>
Mon, 4 Aug 2025 23:39:40 +0000 (19:39 -0400)
commit32ef32d5a0a761c9a050162facc0e3cab455d6fa
tree292db68723ee0bf159d48c5882cc9ac04a45456ftree | snapshot
parenta80b31e1cd1543580853fb0b72dfa19b3ec9ea2ccommit | diff
Add Offset Canes + Trinket Canes Group (#39272)

* Added offset cane

* Added offset cane colors

* Added canes to the trinkets menu

* added color to names instead of suffix

* removes some stripes from the mime cane icon

* update file organization

* standard -> standard.rsi, stop making commits at nearly 3 in the morning.

* updated comment to be more explicit in what doesnt work

* Cane refactor :godo:

* git makes me very upset sometimes (fixed cane yaml)

* wooden->wood

* apparently this didnt push

* Standardize comments

* Removed comment

* Removed comment

* Adds red accents to mime cane

* Indent fixes
35 files changed:
Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml [new file with mode: 0644] blob
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml diff | blob | history
Resources/Prototypes/Loadouts/loadout_groups.yml diff | blob | history
Resources/Prototypes/Recipes/Lathes/Packs/medical.yml diff | blob | history
Resources/Prototypes/Recipes/Lathes/medical.yml diff | blob | history
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский