Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

This commit is contained in:
Poojawa
2019-09-16 17:44:10 -05:00
124 changed files with 6067 additions and 6103 deletions
@@ -1,26 +0,0 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "ipcmeat"
desc = "Gross robot meat."
filling_color = "#000000"
tastes = list("metal" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "mothmeat"
desc = "Moth meat."
filling_color = "#BF896B"
tastes = list("insects" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "birdmeat"
desc = "Quality bird meat."
filling_color = "#BF896B"
tastes = list("chicken" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
desc = "Furry meat. WHO DID THIS?!"
filling_color = "#6B8E23"
tastes = list("brains" = 1, "meat" = 1)