cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

using initial is better practice

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-12 21:38:09 +01:00
parent 0705130448
commit c0687886e4
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/events/travelling_trader.dm
View File

@@ -55,9 +55,7 @@
/mob/living/carbon/human/dummy/travelling_trader/proc/setup_speech(var/input_speech, var/obj/item/given_item) /mob/living/carbon/human/dummy/travelling_trader/proc/setup_speech(var/input_speech, var/obj/item/given_item)
if(requested_item) if(requested_item)
var/atom/temp_requested = new requested_item input_speech = replacetext(input_speech, "requested_item", initial(requested_item.name))
input_speech = replacetext(input_speech, "requested_item", temp_requested.name)
qdel(temp_requested)
if(given_item) if(given_item)
input_speech = replacetext(input_speech, "given_item", given_item.name) input_speech = replacetext(input_speech, "given_item", given_item.name)
return input_speech return input_speech
@@ -128,13 +126,12 @@
/mob/living/carbon/human/dummy/travelling_trader/cook/Initialize() /mob/living/carbon/human/dummy/travelling_trader/cook/Initialize()
//pick a random crafted food item as the requested item //pick a random crafted food item as the requested item
var/recipe = pick(subtypesof(/datum/crafting_recipe/food)) var/datum/crafting_recipe/food_recipe = pick(subtypesof(/datum/crafting_recipe/food))
var/datum/crafting_recipe/food/new_recipe = new recipe var/result = initial(food_recipe.result)
if(istype(new_recipe.result, /obj/item/reagent_containers/food)) //not all food recipes make food objects (like cak/butterbear) if(ispath(result, /obj/item/reagent_containers/food)) //not all food recipes make food objects (like cak/butterbear)
requested_item = new_recipe.result requested_item = result
else else
requested_item = /obj/item/reagent_containers/food/snacks/copypasta requested_item = /obj/item/reagent_containers/food/snacks/copypasta
qdel(new_recipe) //we don't need it anymore
..() ..()
//botanist //botanist