Commit Graph

19 Commits

Author SHA1 Message Date
FlipBrooke
89fa7c2914 Wearable banana peels (#38868)
* Add wearable helmet sprites for banana and mimana peels

Made it so banana peels and their variants can be worn as head gear. The sprites were done by myself, so feel free to change or update them! Includes hamster compatibility.

* fixed a minor state bug

* Review fixes

- Removed blank space
- Added "FlipBrooke" to all modified meta.jsons, with the added note of which sprites I got the colors from/referenced.

* I forgot a comma

adds a comma and some periods
2025-07-17 12:29:36 -04:00
mubururu_
cae49ae0d2 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>
2024-11-24 17:24:13 +01:00
Ed
1b0c434a9f Shiny Diamonds (#25750)
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
2024-07-13 15:15:57 +03:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200)
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
2024-04-28 13:07:36 +02:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
2023-09-24 15:57:10 -04:00
brainfood1183
2fba2b18ab Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
MisterMecky
a7571ac45b Add cardboard material (#14701)
* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things
2023-03-27 19:04:24 -04:00
MisterMecky
fba633a6b1 Modify and add stack sprites for wood (#14684) 2023-03-23 22:26:19 -04:00
Alekshhh
7a87aaaf2e Space Bear 2 (#14591) 2023-03-12 01:35:52 +11:00
Rane
93cdca4f82 Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238)
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
2022-04-17 17:34:14 +10:00
Swept
6376e60b78 Massive Food PR (#3436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-05-03 13:17:22 +02:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
Swept
f23e35dc40 Adds tons of new materials + cleans up existing ones (#3413)
* RSIs are now banging

* Sheets

* Hotfix

* Last before PR

* Ready

* Quick

* E

* Updates everything to new stack PR

* Finished off ore, set max stack size to 30 from 50.

* Most materials done

* Donezo

* Adds hides and custom sprited a corgi hide

* Should be good

* suffix

* Bugs

* Giff woodplank

* Profit?
2021-02-26 18:59:24 +11:00
Swept
1e13c3b265 Fixes lathe stuff (#3383) 2021-02-23 18:53:14 +11:00
Tarlan2
3ee4c5f791 Auto lathe branch (#3284)
* My first contribution in a while.Change AddAccent command to be case insensitive (#3112)

* got rid of the bottle of nothingness. thought it was an empty bottle.

* new correction

* Delete SpaceStation14.sln

I honestly don't know what happened here. I didn't code those lines.

* Revert "Delete SpaceStation14.sln"

This reverts commit 68876841dce9c6e2ce9d21996e4caef3512b1385.

* new attempt at fixing

* Revert "new attempt at fixing"

This reverts commit 780f66fda3d66b6d4d086871d0b2ea2f6d4ee004.

* Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"

This reverts commit 08041a30365331b82309aedaf2136d7631459887.

* Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""

This reverts commit b2dc76a6683e8df88188d37a836f9ab9a54287b5.

* Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"""

This reverts commit 478d2bfe5daf6098d2f5665249ce0f161704dd73.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* still having figured what happened with the sln file

* please work

* -Added wood as a material.
-Made a few changes in the material requirements for some of the recipes.

* ok. added a small correction for wood at material_stacks.yml

* ok added another correction for misc.yml because for some reason a : just disappeared.

* -added plastic as a material, complete with a png (credits: tgstation)
-replaced glass with plastic for material requirements for some of the latherecipes

* for some reason the shovel was duplicate, being in both botany.yml and in tools.yml. deleted it from tools

* ok. one last try. noticed that the sprite path for shovel was weird even though it already has its own sprite at Objects/Tools/shovel.rsi . so I decided to fix the path then move the shovel back to tools.yml while deleting it from botany.yml. maybe that was the problem?

* corrected the extra space on the type: material for plastic discovered by Peptide90.

* noticed that wood also had a bad icon path.

* another attempt

* weird. I don't remember messing with the flashlight requirements.

* added plastic in the SharedStakedComponent and the meta.json from materials.rsi is back to how it was

* hopefully this icon is valid.

* small corrections concerning double space.

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-02-23 13:30:50 +11:00
Vera Aguilera Puerto
9b1142973e Renames phoron to plasma everywhere in the codebase and replaces sprites. (#3110) 2021-02-09 19:05:19 +01:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
Swept
3103e60c3f Fixes icons on consoles (#2351) 2020-10-21 22:01:28 +02:00
Swept
898744f4a9 Icon fixing and general cleanup (#2156)
* Cable coils now look BEAUTIFUL and have inhands

* Editors note

* Materials have their own rsi + more icons fixed

* Fixed Mimic [AI]

* More icons fixed...

* Tanks have own rsi and fixed tank icons

* Airlock icons fixed

* Fuel tank hotfix

* Arcade fixed

* ChairBase is now abstract

* Fixes medical stuff

* Fixes rechargers

* Pump/Pipe icons

* Misc hotfixes

* All debug power icons fixed!

* Fixes auto/proto/research computer icons
2020-09-30 12:43:06 +02:00