* borg law 2 explode
* attributions fix + CL fix
* please dear god work i beg you
* maybe this will work :godo:
* 50% off deal + disc change
* absolving merge conflict
* merge conflict fix
* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml
* Apply suggestions from code review
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* 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
* Implement changes on not-cooked branch
* Made it work
* Fix update appearance calls
* Fix extra indents, clean-up code, fix tests hopefully
* Fix hammy cagecrate
* Fix messing up the yml, add artifact crate specific labels back in
* Visual Studio hates yml, sad
* Seperate the colors for cargonia
* sorry json
* make label move with artifact door
* Apply suggestion changes
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Add more lily usage (orange hairflower and flowercrown)
* comit 2
* ee
* more fixes
* w
* im stupid
* bring poppy in authodrobe
* weh
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Check for CRLF in actions workflow
Make emisse weep
* Copy paste bottom text
* I would like to thank StackOverflow for this spite PR.
* Mention file name in message because the workflow tab doesn't display it.
* dos2unix everything
* LockVisualizer
* Fix state
* Clean some code
* Make it component, fix tests fail
* Fix for StateUnlocked
Now it is possible to manually set the unlocked state and it will work!
* Optimize LockVisualizer, add check for unlocked state
* No todo I guess
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.
* Resprite of the monstrosity
* Resprite of the tourniquet NO LONGER PHALLUS SHAPED
* too bright, now darker and edgier
* Tourniquet resprite
* metajson yay
* Added ore bag of holding
* Now its in industrial tecnologi
Yeah, I fixed it with Tunguso4ka
Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
* Update ore_bag_holding.yml
Now the "magnet" has a larger radius of attraction
* Changed location
---------
Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
* clustergrenades go boom
* Small tweaks
* Some tweaks and soaplet
* clustergrenadesystem changes and launcher types
* small tweaks
* typo
* whitespace
* rsi edit
* another typo
* add containers
* Some changes related to merge
* Forgot to change name
* Made changes based on review
* Removed new china lake ammo based on feedback in other PR
* Unneeded nested loop moment
* Nested loop needed after all moment
* Added cryo syringe, sprite courtesy of Ubaser
* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly
* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW
* added canReact at the wrong place, fixed now
* made the transfer good
* more issues with the sprites
* not much to say, one must imagine sisyphus happy
* mmm yes give me 0 of layers
* I oughta double check shit more
* Should be all done!
* I didn't add it to the lathe, I am le stupide
* Forgot to add the recipe somewhere
* final touches, can actually be made at the medlathe now
* added the recipe to the protolathe as well
* added bananadine and its functionallity (and backed banana peel)
* added baked banana peals sprites
* fixed typos and changed the sprite used by backed banan peel to the right one
* Changed the cooktime and now grinded baked banana leaves have carbon
* Updated bananadine description
* Ficed typo in ragent-desc-bananadine
* Reverted actidental change to nocturine
* Add cotton plant
* Adddescription and tag to cotton bal allow moth eat it
* Fix typo. Add cotton seed into MegaSeed
* Fix typo
* Fix typo
* Fix cottonbol component typo
* Fix the amount of cotton that bol gives
* Adding correct component to make cotton bol edible
* Change cotton bol parent to see if it is edible
* Adding flavor to cotton bol, and fix typo
* Replace image
* fixing plant image position
* Increase the Megaseed restock crate price to avoid money farming loop hole
* soap reagent and soapy water
* make soapy water recognizable
* Fix tile cleaning bug
CleanDecalsReaction was able to take more than the reactVolume it was given.
* make soapy water an evaporating reagent
* Tile reactions when mopping
* Fix indescribably soap flavor
* Adjust soap flavours
Soap and soapy water now taste clean and syndie soap tastes like punishment.
* Better soap numbers & DeleteOnSolutionEmpty
* Changed TrashOnEmpty to TrashOnSolutionEmpty
* Last TrashOnSolutionEmpty change
* Fix merged code not compiling
* Requested changes.
* Add Pea Plants
* Pea soup
* Update flavor-profiles.ftl
* Update seeds.yml
* Add seeds to vendors
* Make things more expensive to fix free money exploit
* Update textures
* Revert "Update textures"
This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.
Vines dont grow straight into the air.
* Shift up 4 pixels
* Fuck autofix conflitcs
* Shift up 3 more pizels
* I finally got byond working so I made sure they were EXACTLY the same
* Address Reviews? I think?
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Pumpkin textures
* Pumpkin prototypes
* Jack o lantern prototypes and pumpkin cake
* Finishing touches
* Arbitrageloose
* Restore old pumpkin helmet sprites (God I hope it works)
Mangohydra
potato1234_x
Ubaser
Terraspark4941
Gyrandola
Ed
Verm
lzk
Pieter-Jan Briers
Alzore
metalgearsloth
MjrLandWhale
Moomoobeef
MilenVolf
PoorMansDreams
themias
Tayrtahn
TruePaInt
GreyMario
ERROR404
Alekshhh
Guilherme Ornel
Stanislav4ix
NkoKirkto
Arendian
Boaz1111
DoubleRiceEddiedd
Feluk6174
Doru991
Psychpsyo
ZeroDayDaemon
Link
Velcroboy
Nim