diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 51d37316869..68b8ef0bd84 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -138,7 +138,7 @@ required_count = 8 random_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/muffin, - /obj/item/reagent_containers/food/snacks/nt_muffin, + /obj/item/reagent_containers/food/snacks/burger/nt_muffin, /obj/item/reagent_containers/food/snacks/berrymuffin) /datum/bounty/item/chef/chawanmush diff --git a/code/modules/cooking/recipes/recipes_burger.dm b/code/modules/cooking/recipes/recipes_burger.dm index 263116abc25..669153a8497 100644 --- a/code/modules/cooking/recipes/recipes_burger.dm +++ b/code/modules/cooking/recipes/recipes_burger.dm @@ -86,7 +86,7 @@ /obj/item/reagent_containers/food/snacks/cheesewedge ) reagent_mix = RECIPE_REAGENT_REPLACE - result = /obj/item/reagent_containers/food/snacks/nt_muffin + result = /obj/item/reagent_containers/food/snacks/burger/nt_muffin /singleton/recipe/bearburger items = list( diff --git a/code/modules/reagents/reagent_containers/food/snacks/burger.dm b/code/modules/reagents/reagent_containers/food/snacks/burger.dm index 9bc25f39ad4..de46b538f47 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/burger.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/burger.dm @@ -169,7 +169,7 @@ reagent_data = list(/singleton/reagent/nutriment = list("buns" = 25)) bitesize = 10 -/obj/item/reagent_containers/food/snacks/nt_muffin +/obj/item/reagent_containers/food/snacks/burger/nt_muffin name = "\improper NtMuffin" desc = "A NanoTrasen sponsered biscuit with egg, cheese, and sausage." icon_state = "nt_muffin" diff --git a/html/changelogs/Acetrea-Ntmuffin.yml b/html/changelogs/Acetrea-Ntmuffin.yml new file mode 100644 index 00000000000..300873cc921 --- /dev/null +++ b/html/changelogs/Acetrea-Ntmuffin.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: Acetrea + +# 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: + - bugfix: "Fixed the NT Muffin sprite issue." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 5655a8a5633..b496f5e1f36 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -33462,12 +33462,12 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/reagent_containers/food/snacks/nt_muffin{ +/obj/item/reagent_containers/food/snacks/burger/nt_muffin{ layer = 2.99; pixel_x = 13; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/nt_muffin{ +/obj/item/reagent_containers/food/snacks/burger/nt_muffin{ pixel_x = 11; pixel_y = 1 }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 952d58f378e..3191049dcfa 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -5416,12 +5416,12 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/reagent_containers/food/snacks/nt_muffin{ +/obj/item/reagent_containers/food/snacks/burger/nt_muffin{ layer = 2.99; pixel_x = 13; pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/nt_muffin{ +/obj/item/reagent_containers/food/snacks/burger/nt_muffin{ pixel_x = 11; pixel_y = 1 },