* Adds cotton burgers
* Rephrased copyright
* Added an extra comment
* Adds CottonBurger to tags.yml, Not sure if i am supposed to do this or not.
* Reordered Cotton bun YAML, and fixed overwritten tags
* Merge issue fix?
* Add experiment plushie and remove rubber chicken from cotton burgers
* Minor comment change
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
* Land Mine is now armable, it will not explode unless armed.
* Land Mine is now armable, it will not explode unless armed.
* Explicitly have Armed as false
* SharedLandMineSystem.cs adds the "Arm"-verb in "Content.Shared" with the Arming logic being implemented in "Content.Server"
* Land Mines now blink only when armed.
* Added prediction components, moved logic to SharedLandMineSystem.cs and inherit it in client content.
* Accessing the datafield directly instead of using methods
* Mines are now armed by default with a unarmed prototype
* Land mine now shows if it is armed when examined and in range.
* Landmine is unarmed by default with an armed variant for mapping purposes.
* Removed properties that were already defined by inheritance.
* Access the bool directly from the component
* Add booleans to change if the Arm-verb is showed and if examining the mine shows the status.
* Added status message for unarmed mine, removed using PushGroup since only one string is displayed.
* Added properties to the explosive floor sign to ensure that it is armed, not showing neither status nor arm-verb.
* The prototypes work now as before with added unarmed versions. Sprite is now only one toggable layer.
* Make the craftable land mine unarmed.
* Refactored the arming mechanic into own component and system.
* Reverted the explosive wet floor sign to previous prototype and added the Armable component and ItemToggle to the landmines.
* Moved the examination strings from land-mines.ftl to armable.ftl.
* Removed unused property.
* Formatting and fixing imports
* Added prefixes to the ftl naming. Moved LocId from system to component
* Added documentation. Moved check for armable to HandleStepTriggerAttempt.
Moved the LocId to component.
* Removed the TryArming method. Added documentation.
* Removed unnecessary TryComp
* Simplified the logic for the trigger attempt
* HasComp instead of TryComp on logic
* EmoGarbage Review
---------
Co-authored-by: Franz - Josef Björck <kaiserbirch@proton.me>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
* Preliminary eggnog changes (egg in shaker crashes?)
* Fixed eggnog reagent name and description
* added - to flavor
* deleted a space
* Added eggnog glass sprite
* changed fill levels to match rsi
* Added two more fill levels to eggnog
* Removed fizziness, changed physical description, and fixed rsi
---------
Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* added start to bacchus blessing with few more things left to do
* added sprites and trying to get the empty sprite to work
* fixed empty sprite will fill layer
* added missing fill image
* made flavor, physical description, recipe reaction and tweaked reagent threshold
* fixed fill levels
* removed name from drinks.yml, updated suffix instead
* delay is weird and broken, removing the difference
* updated copyright
* This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both.
* Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time.
* Sorted tags.yml alphabetically this time instead of not doing that.
* Updated Texture Copyright information
* Attempted to fix Merge Conflict
* Added bulb light variants for both yellow and black crystals.
* Added New Cocktails and new fill level sprites to existing drinks
* Updated copyright info and fixed recipies for Caipirinha/Mojito.
---------
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
* Grilled Cheese Prototype
* Typos
* Removed butter reagent to test flavour changes.
* Flavour corrections.
* CC-BY-SA-3.0 attribution
* Fixing meta.json
* I lost an hour of my life to a missing comma in meta.json
* Merge Conflict Rebase and Test Fixing
* Cook time to 10 seconds.
* Sandwich nutritional balance
* Grilled cheese sprite fixed, found the actual original source for copyright.