From 07fac4271202f893cc3800b7938fe9f044d21863 Mon Sep 17 00:00:00 2001 From: alexkar598 Date: Fri, 16 Jun 2017 16:08:02 -0400 Subject: [PATCH] Fixes issue 7505 (Rename Spagetti to Spaghetti) (#7516) * rename spagetti to spaghetti * Rename Spagetti to Spaghetti in the dmi file too * trying to fix my things should learn to use git proporly one day * commit --- .../food_and_drinks/food/customizables.dm | 6 +++--- code/modules/food_and_drinks/food/snacks.dm | 20 +++++++++--------- .../kitchen_machinery/processor.dm | 2 +- .../recipes/recipes_microwave.dm | 16 +++++++------- .../carbon/human/interactive/functions.dm | 4 ++-- icons/obj/food/food.dmi | Bin 126868 -> 126869 bytes 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 7087410e6c4..b055711c928 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -21,7 +21,7 @@ ..() -/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W, mob/user, params) +/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP)) var/obj/item/weapon/reagent_containers/food/snacks/customizable/pasta/S = new(get_turf(user)) S.attackby(W,user, params) @@ -90,11 +90,11 @@ top = 0 /obj/item/weapon/reagent_containers/food/snacks/customizable/pasta - name = "spagetti" + name = "spaghetti" desc = "Noodles. With stuff. Delicious." icon_state = "pasta_bot" baseicon = "pasta_bot" - basename = "spagetti" + basename = "spaghetti" add_overlays = 0 top = 0 diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index bc8d0928b7e..f98f870ed79 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -1013,10 +1013,10 @@ filling_color = "#C4BF76" list_reagents = list("nutriment" = 2) -/obj/item/weapon/reagent_containers/food/snacks/spagetti - name = "Spagetti" +/obj/item/weapon/reagent_containers/food/snacks/spaghetti + name = "Spaghetti" desc = "A bundle of raw spaghetti." - icon_state = "spagetti" + icon_state = "spaghetti" filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) @@ -1400,10 +1400,10 @@ trash = /obj/item/trash/plate list_reagents = list("nutriment" = 8) -/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti - name = "Boiled Spagetti" +/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti + name = "Boiled Spaghetti" desc = "A plain dish of noodles, this sucks." - icon_state = "spagettiboiled" + icon_state = "spaghettiboiled" trash = /obj/item/trash/plate filling_color = "#FCEE81" list_reagents = list("nutriment" = 2, "vitamin" = 1) @@ -1425,7 +1425,7 @@ list_reagents = list("nutriment" = 7, "vitamin" = 2) /obj/item/weapon/reagent_containers/food/snacks/pastatomato - name = "Spagetti" + name = "spaghetti" desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" icon_state = "pastatomato" trash = /obj/item/trash/plate @@ -1433,10 +1433,10 @@ bitesize = 4 list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4) -/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti - name = "Spagetti & Meatballs" +/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti + name = "spaghetti & Meatballs" desc = "Now thats a nic'e meatball!" - icon_state = "meatballspagetti" + icon_state = "meatballspaghetti" trash = /obj/item/trash/plate filling_color = "#DE4545" list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 38edb2e2174..e2ae3f66285 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -85,7 +85,7 @@ /datum/food_processor_process/spaghetti input = /obj/item/weapon/reagent_containers/food/snacks/doughslice - output = /obj/item/weapon/reagent_containers/food/snacks/spagetti + output = /obj/item/weapon/reagent_containers/food/snacks/spaghetti /datum/food_processor_process/parsnip input = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 24eeb7e0148..a0998a67a58 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -351,12 +351,12 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat -/datum/recipe/microwave/boiledspagetti +/datum/recipe/microwave/boiledspaghetti reagents = list("water" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/spagetti, + /obj/item/weapon/reagent_containers/food/snacks/spaghetti, ) - result = /obj/item/weapon/reagent_containers/food/snacks/boiledspagetti + result = /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti /datum/recipe/microwave/boiledrice reagents = list("water" = 5, "rice" = 10) @@ -368,7 +368,7 @@ /datum/recipe/microwave/pastatomato reagents = list("water" = 5) - items = list(/obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + items = list(/obj/item/weapon/reagent_containers/food/snacks/spaghetti, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato @@ -376,19 +376,19 @@ items = list(/obj/item/seeds/poppy, /obj/item/weapon/reagent_containers/food/snacks/dough) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel -/datum/recipe/microwave/meatballspagetti +/datum/recipe/microwave/meatballspaggetti reagents = list("water" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/spagetti, + /obj/item/weapon/reagent_containers/food/snacks/spaghetti, /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/meatball, ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti + result = /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti /datum/recipe/microwave/spesslaw reagents = list("water" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/spagetti, + /obj/item/weapon/reagent_containers/food/snacks/spaghetti, /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/meatball, diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index eb7b767dc94..46706c45363 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -420,9 +420,9 @@ return doing |= SNPC_SPECIAL - var/static/list/customableTypes = list(/obj/item/weapon/reagent_containers/food/snacks/customizable,/obj/item/weapon/reagent_containers/food/snacks/breadslice,/obj/item/weapon/reagent_containers/food/snacks/bun,/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti,/obj/item/trash/plate,/obj/item/trash/bowl) + var/static/list/customableTypes = list(/obj/item/weapon/reagent_containers/food/snacks/customizable,/obj/item/weapon/reagent_containers/food/snacks/breadslice,/obj/item/weapon/reagent_containers/food/snacks/bun,/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti,/obj/item/trash/plate,/obj/item/trash/bowl) - var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/raw_bacon) + var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spaghetti, /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/raw_bacon) try var/list/allContents = getAllContents() diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 283684b9d46492e4c3cb81d821ea570fb3198bf0..5f8fb26d74c779ac40c4826fda902337c2139ec9 100644 GIT binary patch delta 831 zcmV-F1Hk;0-v^c72aqHIu(2hV1b;J^(vH`GsbH;%3yJMVU@CoWAHxDuLAvo9_xRYZ zk}f2^&|DCU4B{2r1_|i(Oc0{(1XT>*X-EK zGy`I4T!eQV2~(ktqX0JcR6v0Cb4`Obv{xvQb*#Cttq>cz6wer{h2R{gUVpwY(ks`% z9(uvDbx5Gd{)~dLJy9;y_1ZR}3kj##M7dDWfTV$~_a4Oi9FW+Z*s@0Q9cFkhaa@9# zedr|*RR9G6p*F!S`*gTppClI=X3=&OOY-9*>3RcWV^+)lUwSP`ujsbh4F9(5L(wBq4-sWXc;GEl6jTcp4GDU2nlue+fc7+{H5r#j;2Fp z^-RHv&vYC;pJ^OD(4#XotmZT=g(GzKuvDExf^{YjKhnEm;bf4>mw!Cd!iMEjxV+iH z11tHv1CR%P2jQ9th^INyupn=AvgUiXr5y+%JIh)Vt|eWa0`H`=uAXB7)6Y(W=>UG& zkP{8um9s>oai0?ntCyawtgepZUkrGAdwFU9?z=zzy_gO>vR}yUbuhrQ_h4|kVv+M# zPMotRU=NZwHlC(-#D9B6X9B`b636Blu*IDmR2N8X;uw41{)}R+lxH4GK)EoW;=*Tk zSyybyrH&)y!gatqH8*>(^!=beUslGkqR7@a%p*L#7foM)!e4Zeo9 zYFAoBLOYI|QYS8nEJpz%4i&WmG&Fn4{QvHWzCC^V?c?d=ub*%K2UA|ChpYKsAcNco Jx7-H-xaS?(lt2Ig delta 830 zcmV-E1Ht^2-v^Z62aqHIudyYU1b zx{&xnb3qI;h*xYEB%rr5L4fKw$OF4eF%1}?#)a3R_JB+m6gdq((`O?<4;mLWG&`G3Mlt6T$n z=mE>tAb|q=GYW?GM7dDcYukh_B%EOrV0Tcv;+5~s()8Te~l3Zw*McYv<$>SqIO{JY|7s5N)?(XblyT7xO?GDdQc0F?B zdO>&eM+GeC#So}p`f>=?Ie&dQ25gPK90WE=Uk(CWo0ma>b8g=>UT{rEWG{qR`{N@8 zvT0_M0`A{44@O6iKIFQPXx#NRBbI)BwHI zGX*O?({c2Crg8K@i_X-rn$xrtj?mG=Qgsdq)|ou~M(>J+lR+k5@_$SV8 zPBd^=&JvNneNHs2UV65&x;l=3G2rd(<)Qt%@BZ}nVmj=^zJuG-U;t454kU4GJWcI*_kWDe1O%NVj?FV*i90!{E|A*9G4{Cq8O0hY&peiXa$!Klh0pA= zuGo@G9Y@H4>wve#uVFkyK<|ihoyfoowPS2zJMhbZyhbP8Knsw%3k~ffWuaVF%x;QO zF6`hWSahrqgns^s#H_aHSV5&09jh(ePEgx19kTEZg)&+(0)IXYuCUs|E2yEfVw(R# zUL1Cz_k|}e)O*G{4li+R*_Sbpa<@7c3?SDq96-=Y`b>o_u-Aymd1f(p