* Create marble tile textures
* Flatten tiles to better match art style
* Add prototypes and translations for tiles
* Change marble footstep sound to one that makes sense
* Add marble tile object and in-hand sprites
* Add prototypes and translations for marble tile objects
* Add marble tile cutter recipes
* Double number of marble tile variants
* Increase plasma and uranium costs of plasmarble and uranium marble
* Add attributions for marble tile sprites
* Fix whitespace problem hopefully
* Fix trailing whitespace take 2
* Rename just "marble" marble to "white marble"
* Remove cutter recipes for uranium marble and plasmarble
* Now the name of the target craft items is taken directly from the prototypes
* Deleting unnecessary fields
* Deleting unnecessary fields
* Added suffix field
* Added override via localization keys
* My favorite ItemList and TextureRect have been replaced with ListContainer and EntityPrototypeView
* Fix suffix
* Fix construction ghosts... maybe
* Remove suffix from UI
* Suffixes have been removed from prototypes
* Added a description for the secret door
* Fix search..?
* The Icon field of ConstructionPrototype has been removed
* StackPrototypes used in the construction menu have been localized
* TagConstructionGraphStep used in the construction menu have been localized
* The search bar has been localized
* Fix localization and prototypes
* Recipes are now only loaded when the crafting window is opened.
* Fix crooked merge grid of the crafting menu.
* Localization update
* Fix cyborg graph
* Revert "Recipes are now only loaded when the crafting window is opened."
This reverts commit 97749483542c2d6272bda16edf49612c69a0761a.
* Fix loc
* fix merge
* Fix upstream
* Some of the logic has been moved to Shared
* fix
* Small adjustments
* Very small change
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
* Added astro asteroid sand
* fixed the stack name
* adjusted tile sprites for asteroid and ice
* Adjusted meta.json
* Realized the other tile sprites all have solid lines on their perimeters
* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml
that works
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Update tiles.yml
* Update Resources/Locale/en-US/tiles/tiles.ftl
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* adjusted the snow sprite
* Update meta.json
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Edited blueberry pancake textures to seem more blueberry-stained
* Added new blueberry pancake sprites to allow stacking up to 9
* Added more sprites for chocolate pancakes so they can stack up to 9
* Fixed up the blueberry pancake sprites to be more consistent
* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.
* Updates the stack size in the consumable stacks yaml file.
* Added the new pancake sprites to the sprite meta json file.
* Removed an unnecessary space from the baked food YAML file
* Updated branch and fully resolved merge conflict
* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive
* Diversified the textures some more for good measure.
* Fixed some missing rims around the pancakes because I'm bored
* Makes machine parts stacks, removes unused field in stack prototypes
* forgor
* Fix tests
* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely
* detail
* a
* rainbow weed
* Lipolicide
* psicodine + mannitol
* happiness
* ground + dried + smokables
* damn you notepad++
* fix
WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!
* work
* work i beg you
* recipe good
* possibly fix merge conflict
* remove reagents
* sprites
something something strength and certainty of steel (except this is brass)
* test1
* commas it was commas
* commas and brackets
* LET THERE BE BRASS
* brass-glass-etc-windows-thindows-floors-lattice
* ALL THE STRUCTURES!!
"Which structures did you add?"
"all."
* buyable brass
and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe
* Update windoor.yml
i forgor 💀
* Update tiles.ftl
* i hate random capital letters
* linter fix 1
whew, thank god for linters
* fix 2
* maybe this
shot in the dark, idk what the hell i'm doing hopefully this fixes it?
* fix attempt 1
weather to true, maybe the thingy got confused?
* remove clockwork lattice
it's fixed the test fail... but at what cost?
* changes 1
* fix clockwork windoor
* FLOORS
HAHAHA LET THERE BE FLOORS
* try linter fix 1
i love linters they find things i'd never catch myself
* tweaks fixes 1
fixes merge conflict and does more stuff part two later because i'm tired
* tweaks fixes 2
i should probably do this stuff during the day when i have more energy but eh
* Update assembly.yml
* Update chairs.yml
* fix door sprites
somehow the deny_unlit was broken for all the clockwork doors
* fix glass.yml
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.
* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json
* Added chlorine to the list of solutions salt gives when used in the grinder.
* Gave salt ore and salt rock overlay unique sprites.
* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition
* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
* 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
* Merge before I fuck up anything again
* craft whitelist
* Sericulture
* Spider
* gone
* quickly fixed
* and coders taketh away
* And we take more away
* sericulture improvements
* arachnid
* better webbed
* OH WAIT
* test fail
* Adds Advanced ointment and bruisepack recipes
* Changes the sprites to the ones from /tg
* Changed names and sprites, slight tweaks
* Formatting
* Solve Conflict
* Formatting
* Fix issues found in check
* Fix Oopsie
* Make stack count affect item size
* and the test, too
* readd this check
* vwoom
* huh
* if you ever read this commit message ping me on discord in #contributors
* changerinos
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units.
* Added some comments to explain the blood and bleed code
* added some comments
* added some comments
* profusely bleeding message scales with max bleed rate
* Added some comments
* Added some comments (tm)
* Halved the speed bleed rate heals.
* Changed the wording of a comment to make the function of the values more clear
* Changed bleed rate values, made heat heal more bleed rate
* doubled crit chance, since damage types were reduced
* Made iron restore more blood, 2->4u per 1u
* Starting to add the blood pack
* add bloodlevel to healingcomponent
* Created code support in the healing system for restoring blood
* first test of blood pack prototype
* More pack testing, and defining the yml stack
* yml syntax fix
* adds bloodpack tag
* Successfully added the item, but the effect and deletion after using the item is not working yet.
* the blood regen worksgit add -A!
* blood pack is entirely functioning
* Removed bleed rate healing from brute pack
* Comment correction
* I tried
* Removed bleed stats from corrupted corgi, they inherit same stats from basemob
* Removed bleed stats from xeno, they inherit same stats from a base mob
* Removed bleed stats from diona, they inherit same stats from a base mob
* Removed bleed stats from slimes, they inherit same stats from a base mob
* All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy
* The cautery now closes bleed wounds
* Nerf blood pack bleed rate heal
* Added 2 blood packs to medicine locker
* Added 2 blood packs to wall medicine locker
* Minor YML fix to chemistry locker, no changes in game
* Added tag to medical belt for blood pack, added 2 blood packs to medical belt
* Added 1 gauze to medical belt
* 5 blood packs addded to nanomed plus
* nanomed inventory change
* 2 blood packs added to medical supplies crate from cargo
* Moved 1 gauze from med kit to advanced med kit
* Moved 1 tricord pill from advanced med kit to basic med kit
* added 2 ointment to burn kit
* Moved ina syringe from burn treatment to oxygen kit
* Removed one gauze from brute kit
* Added one bloodpack to brute med kit
* Moved tranex acid syringe from advanced first aid to brute kit
* Poison medipen moved from advanced first aid kit to toxin kit
* Removed health analyzer from advanced first aid kit
* removed one brute pack from advanced aid kit
* added one ointment to advanced aid kit
* Added one blood pack to advanced aid kit
* Added 2 blood packs to combat med kit
* Starting with adding the license for the tg sprite
* Adds the blood pack sprite and meta.json code
* I forgor to actually code the sprite in
* Advanced med kit missing one blood pack
* Replaced tricord pill with emergency medipen in cobat kit
* Removed emergency pen from combat kit, there's no space for it
* Revert "I tried"
This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0.
* Trying to fix yml test fail
* Try again
* attempt number 3
* Restock crate price was too low
* fixing merge conflict without making a HUGE mess this time
* ???
* again
* again
* Can I add the newline now maybe???
* Revert "Can I add the newline now maybe???"
This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f.
* Adds the doafter fix code from Keron to the blood level healing
* minor typo fix
* Feedback from Emisse and sloth; Removed chance based feedback on cauterizing
* comment fix
