* Import several foods and recipes from Hispania!
* Fix trailing newlines, remove hispania icon reference.
* Fix list spacing, add drink reagents, correct annona spelling.
* Amend drink description, move icons
* Apply new timer from @CRUNCH-Borg
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Apply @CRUNCH-Borg's attack chain suggestions
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Fix many duplicate vars.
* Fix more duplicate vars.
* Remove duplicate toast.
* Fix unreachable callback. Now with @CRUNCH-Borg!
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Amend some icons.
* Add vendor seeds, tweak plant sprites.
- Add base seeds to MegaSeed Servitor.
- Change smoked salmon sushi to use smoked salmon instead of salmon steak.
- Make maize dough yellower.
- Fix capitalization in peyote description.
- Make coconut inedible.
- Modify cream cheese recipe to remove conflict with butter.
- Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much.
* Add guacamole recipe, agave distill reagent.
- Add prep bowl recipe for guacamole, condiment container and icons.
- Change cactus salad icon to use new plastic cup shape.
- Add distill reagent "tequila" to agave.
- Make coconuts only attack on harm intent.
- Fix some whitespace.
* Prevent bombonuts from detonating instantly.
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Spellcheck.
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Change some item names, descriptions, recipes.
- Make custom robot head recipe step so that those recipes don't just call for "a head".
- Replace smoked salmon sushi ingredient with new smoked salmon.
- Fix some confusing item names.
- Update descriptions of cacti.
- Add raw mouse as mouse butchering result.
* Modify reagent colors. Make cream cheese bread with cream cheese.
* Adjust some recipes and descriptions.
- Remove hipster ridicule from mate. Add it as a reagent to the plant.
- Touch up some grammar.
- Amend recipe for sweet arepas.
* Fix grown food slicing debug message.
* Grammar improvements feat. CRUNCH
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* dmi time
* .dmi stuff done, maybe
* Created cannibalism.dm and moved KFV's obj stuff.
* Update cannibalism.dm
* Wild Wings and Bug Bar
* A few more.
* Meow Mein
* Lead and Plasma-Bone Broth
* Multiple possible sprites.
* Last food item. Next recipes and the Bone Rod.
* Adding bone rod sprites and sprites for bone rod variants of food with metal rods in them
* Fix complaining of the compiler.
* Bone Rods
* Almost everything done.
* Bone Rods ticked.
* dme updated on compile.
* Forgor the BBQ variant of Moffolo Wings needed a unique path.
* Probably make Plasma-Bone Broth flammable like plasma sheets.
* Should light now, will test later.
* Some recipes, and processor.
* Processor was complaining, also changed a parameter to be readable.
* More bone rod.
* The rest of them.
* No more errors on compile.
* Recipes tested and things fixed.
* Lead works.
* Kidneys dead? Toxin.
* Soy Sauce in the Meow Mein.
* Working sprite RNG.
* Make Linters happy
* Apply suggestions from CRUNCH's code review to fix Plasma-Bone Broth's flame.
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
* Make linters happy
* Updated bone rod description to be less vague.
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
* More descriptive recipe names in code
* Replace Meow Mein sprites with Feline Mignon
I'll see about using the Meow Mein sprite for chef craftable Chow Mein, as the issue is with Meow Mein not the sprite.
* Change code from Meow Mein to Feline Mignon
* Don't need the blank recipe list in this PR.
* Update code/game/objects/items/stacks/bone_rods.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/objects/items/stacks/bone_rods.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: Wenlock_The_British_Hobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Adds the Executive RSF cyborg upgrade.
First commit for the Executive RSF with basic functionality.
* Add cheese knife
Adds a cheese knife along with the RSF upgrade to cut the cheese.
* Executive RSF Upgrade functionality.
Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.
* Nerf cyborg cheeses
Nerfs cyborg cheeses to be worse than chef food.
* Resprites Smoked Cheese
* Fixes power cost calculation
* Cleanup
* Standardize tech and Materials cost
* Adds caviar trash
Adds an empty caviar can.
* Edam and flavor
Add Edam
Adjusts flavors to compete with cheese reagent
* Undo sprinkled donut
Undid changes to RSF donut
* Fix RSF icon missed pixel
* Boolean fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
* Resprites basic cheese
Resprites basic cheese at the request of @DGamerL
* Update new cheese sprite
Adds wax to the new cheese.
* Delete unused cheese icon
Deletes a prototype cheese icon.
* Readds normal cigarettes to the executive RSF
Adds normal cigarettes back to the RSF at Fordoxia's request.
* Turns caviar from red to black
Rebrands caviar into the fancier, black variety
* Deconflict
---------
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
* Adding in new sprites for a bunch of crappy food sprites
* Adding attribution for Goon origin sprites
https://github.com/binarysudoku has relicensed the sprites requested for our use (relicensing means they don't have to go in a separate folder). I've included attribution notes on each sprite that I've taken, as per our license
* Added a bunch more sprite changes!
* forgot the holymelon
* Updating trash sprites for junk food, adding a space twinkie trash sprite
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!
Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes
The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.
Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!
Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)
Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.
The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.
Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard
Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds
Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.
Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.
This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
Conflicts:
code/game/objects/items/trash.dm
code/modules/reagents/reagent_containers/food/drinks.dm
icons/obj/janitor.dmi
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.
There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.
Next up: Finish the files in the weapon folder, then start moving defines down.
My god I hope I havent broken everything.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.
r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds
[VGTG]
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
-Increased the amount of lights you get from adding glass to the Light Replacer.
-Emagging the light replacer is one way.
-You can add lights to the light replacer to add uses.
-You can unload the trash bag by clicking on it.
-Vodka now heals toxin damage.
-Made light tubes the same price as light bulbs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4114 316c924e-a436-60f5-8080-3fe189b3f50e
Alan