]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91b9d4a) | patch
various material & ore inhands (#33342)
authormubururu_ <139181059+muburu@users.noreply.github.com>
Sun, 24 Nov 2024 16:24:13 +0000 (10:24 -0600)
committerGitHub <noreply@github.com>
Sun, 24 Nov 2024 16:24:13 +0000 (17:24 +0100)
commitcae49ae0d231994b523d4b11855904102544f0cf
tree341bd1ac1a5826ab895392314fbb00bcc5b46530tree | snapshot
parent91b9d4a7f0aeb91ef54c1396785c0cd8e856d6efcommit | diff
various material & ore inhands (#33342)

* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* pyrottOn

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
50 files changed:
Resources/Prototypes/Entities/Objects/Materials/materials.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Materials/ore.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Materials/parts.yml diff | blob | history
Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/hide.rsi/goliathhide-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/hide.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/bananium-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/bones-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cardboard-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cloth-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/corgihide-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/cotton-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/durathread-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/materials.rsi/pyrotton-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/bananium-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/coal-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/diamond-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/gold-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/iron-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/plasma-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/salt-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/silver-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/spacequartz-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/ore.rsi/uranium-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/parts.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/parts.rsi/rods-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/silk.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Materials/silk.rsi/silk-inhand-right.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский