diff --git a/aurorastation.dme b/aurorastation.dme index 8c3b7885e38..afe67502ce5 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3340,15 +3340,15 @@ #include "maps\away\ships\einstein\ee_spy_ship_ghostroles.dm" #include "maps\away\ships\elyra\elyra_strike_craft.dm" #include "maps\away\ships\elyra\elyra_strike_craft_ghostroles.dm" +#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette.dm" +#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette_areas.dm" +#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_ghostroles.dm" #include "maps\away\ships\hegemony\merchants_guild\merchant_freighter.dm" #include "maps\away\ships\hegemony\merchants_guild\merchant_freighter_areas.dm" #include "maps\away\ships\hegemony\merchants_guild\merchant_freighter_ghostroles.dm" #include "maps\away\ships\hegemony\miners_guild\miners_guild_areas.dm" #include "maps\away\ships\hegemony\miners_guild\miners_guild_ghostroles.dm" #include "maps\away\ships\hegemony\miners_guild\miners_guild_station.dm" -#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette.dm" -#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_corvette_areas.dm" -#include "maps\away\ships\hegemony\hegemony_corvette\hegemony_ghostroles.dm" #include "maps\away\ships\iac\iac_rescue_ship.dm" #include "maps\away\ships\iac\iac_rescue_ship_ghostroles.dm" #include "maps\away\ships\kataphracts\kataphract_areas.dm" diff --git a/code/datums/trading/food.dm b/code/datums/trading/food.dm index c97dcb2c33a..2ff38a58729 100644 --- a/code/datums/trading/food.dm +++ b/code/datums/trading/food.dm @@ -123,7 +123,6 @@ /obj/item/reagent_containers/food/snacks/fruit_slice = TRADER_BLACKLIST, /obj/item/reagent_containers/food/snacks/grown = TRADER_BLACKLIST_ALL, /obj/item/reagent_containers/food/snacks/human = TRADER_BLACKLIST_ALL, - /obj/item/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST, /obj/item/reagent_containers/food/snacks/meat/human = TRADER_BLACKLIST, /obj/item/reagent_containers/food/snacks/variable = TRADER_BLACKLIST_ALL ) @@ -184,7 +183,6 @@ /obj/item/reagent_containers/food/snacks/sliceable = TRADER_SUBTYPES_ONLY, /obj/item/reagent_containers/food/snacks/sliceable/pizza = TRADER_BLACKLIST_ALL, /obj/item/reagent_containers/food/snacks/sliceable/flatdough = TRADER_BLACKLIST, - /obj/item/reagent_containers/food/snacks/sliceable/cake/brain = TRADER_BLACKLIST, /obj/item/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE, /obj/item/reagent_containers/food/snacks/applepie = TRADER_THIS_TYPE ) diff --git a/code/modules/cooking/recipes/recipes_mix.dm b/code/modules/cooking/recipes/recipes_mix.dm index 8e357c3be87..18959ceaac7 100644 --- a/code/modules/cooking/recipes/recipes_mix.dm +++ b/code/modules/cooking/recipes/recipes_mix.dm @@ -35,13 +35,6 @@ ) result = /obj/item/reagent_containers/food/snacks/burger -/singleton/recipe/brainburger - items = list( - /obj/item/reagent_containers/food/snacks/bun, - /obj/item/organ/internal/brain - ) - result = /obj/item/reagent_containers/food/snacks/burger/brain - /singleton/recipe/xenoburger items = list( /obj/item/reagent_containers/food/snacks/bun, diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index b0286439ece..3d70d3b7488 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -122,11 +122,6 @@ fruit = list("apple" = 2) result = /obj/item/reagent_containers/food/snacks/sliceable/cake/apple -/singleton/recipe/cake/brain - appliance = OVEN - items = list(/obj/item/organ/internal/brain) - result = /obj/item/reagent_containers/food/snacks/sliceable/cake/brain - /singleton/recipe/honeybun appliance = OVEN items = list( diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 1f07732f369..23fcb83ee26 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1228,7 +1228,6 @@ /obj/item/reagent_containers/food/snacks/bananabreadslice, /obj/item/reagent_containers/food/snacks/tofubreadslice, /obj/item/reagent_containers/food/snacks/cakeslice/carrot, - /obj/item/reagent_containers/food/snacks/cakeslice/brain, /obj/item/reagent_containers/food/snacks/cakeslice/cheese, /obj/item/reagent_containers/food/snacks/cakeslice/plain, /obj/item/reagent_containers/food/snacks/cakeslice/orange, diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 69dbdaf7a85..37eb7350889 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1032,16 +1032,6 @@ reagents.add_reagent(/singleton/reagent/hyperzine, 1.5) reagents.add_reagent(/singleton/reagent/synaptizine, 1.25) -/obj/item/reagent_containers/food/snacks/burger/brain - name = "brainburger" - desc = "A strange looking burger. It looks almost sentient." - icon_state = "brainburger" - filling_color = "#F2B6EA" - center_of_mass = list("x"=15, "y"=11) - bitesize = 2 - - reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 6, /singleton/reagent/alkysine = 6) - /obj/item/reagent_containers/food/snacks/burger/ghost name = "ghost burger" desc = "Spooky! It doesn't look very filling." @@ -2771,32 +2761,6 @@ reagent_data = list(/singleton/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "carrot" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cake/brain - name = "brain cake" - desc = "A squishy cake-thing." - icon_state = "braincake" - slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brain - slices_num = 5 - filling_color = "#E6AEDB" - center_of_mass = list("x"=16, "y"=10) - reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 25, /singleton/reagent/alkysine = 10) - reagent_data = list(/singleton/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "slime" = 15)) - bitesize = 2 - -/obj/item/reagent_containers/food/snacks/cakeslice/brain - name = "brain cake slice" - desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." - icon_state = "braincakeslice" - trash = /obj/item/trash/plate - filling_color = "#E6AEDB" - bitesize = 2 - center_of_mass = list("x"=16, "y"=12) - -/obj/item/reagent_containers/food/snacks/cakeslice/brain/filled - reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 5, /singleton/reagent/alkysine = 2) - reagent_data = list(/singleton/reagent/nutriment = list("cake" = 2, "sweetness" = 2, "slime" = 3)) - bitesize = 2 - /obj/item/reagent_containers/food/snacks/sliceable/cake/cheese name = "cheese cake" desc = "DANGEROUSLY cheesy." diff --git a/html/changelogs/mattatlas-ashes.yml b/html/changelogs/mattatlas-ashes.yml new file mode 100644 index 00000000000..8d193a9173f --- /dev/null +++ b/html/changelogs/mattatlas-ashes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Removed the brainburger and braincake." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 19be35dc11b..2a33d3edc47 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ