Skip to content

Moving meat types from snacks.dm to meat.dm

Rob Nelson requested to merge pull/4602/Meat_Migration into Bleeding-Edge

Created by: Probe1

This is my first PR and the last two days of work comprise of my entire lifetime of coding. Please review this thoroughly.

  • All meat types are now in [meat.dm]. This includes only the basic meat types like raw chicken or bear meat. It also includes eggs.
  • 123 recipes that called on meat types not already in meat.dm repathed to now look in meat.dm (ie /obj/item/weapon/reagent_containers/food/snacks/egg is now /obj/item/weapon/reagent_containers/food/snacks/meat/egg)
  • Smartfridges now smartly take anything from meat.dm instead of just monkeymeat.
  • Plant bags now pick up all meat types instead of just plain meat and eggs.
  • xenomeat renamed from 'meat' to 'xeno meat'
  • meatbread is now located below xenomeatbread and spidermeatbread to prevent it from overwriting them during cooking and turning xeno/spidermeatbread into regular meatbread.
  • microwave.dm also reordered to carpmeat and eggs below meat instead of above.

addresses https://github.com/d3athrow/vgstation13/issues/4586

I'm not sure if this needs a changelog since it's mostly backend stuff but if it does I'll figure out how to do that.

Merge request reports