From e16c4c73e374432cc51256ba8df3b4b67328f87c Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Fri, 26 Jan 2018 20:46:14 +0200 Subject: [PATCH 1/2] Removes overhead and fixes null runtime with NAMEOF --- code/__HELPERS/unsorted.dm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index d33525e012..92ed3965e5 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1520,7 +1520,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) . += V //datum may be null, but it does need to be a typed var -#define NAMEOF(datum, X) (list(##datum.##X, #X)[2]) +#define NAMEOF(datum, X) (#X || ##datum.##X) #define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##target, ##var_name, ##var_value) //dupe code because dm can't handle 3 level deep macros @@ -1535,3 +1535,32 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) D.vv_edit_var(var_name, var_value) //same result generally, unless badmemes else D.vars[var_name] = var_value +<<<<<<< HEAD +======= + +/proc/get_random_food() + var/list/blocked = list(/obj/item/reagent_containers/food/snacks, + /obj/item/reagent_containers/food/snacks/store/bread, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/store/cake, + /obj/item/reagent_containers/food/snacks/cakeslice, + /obj/item/reagent_containers/food/snacks/store, + /obj/item/reagent_containers/food/snacks/pie, + /obj/item/reagent_containers/food/snacks/kebab, + /obj/item/reagent_containers/food/snacks/pizza, + /obj/item/reagent_containers/food/snacks/pizzaslice, + /obj/item/reagent_containers/food/snacks/salad, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/meat/slab, + /obj/item/reagent_containers/food/snacks/soup, + /obj/item/reagent_containers/food/snacks/grown, + /obj/item/reagent_containers/food/snacks/grown/mushroom, + /obj/item/reagent_containers/food/snacks/deepfryholder + ) + blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable) + + return pick(typesof(/obj/item/reagent_containers/food/snacks) - blocked) + +/proc/get_random_drink() + return pick(subtypesof(/obj/item/reagent_containers/food/drinks)) +>>>>>>> 1a45d35... Merge pull request #34875 from tgstation/Cyberboss-patch-5 From 84be31bb006bc15128d9232d01b53bfc63636be1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 28 Jan 2018 15:19:22 -0600 Subject: [PATCH 2/2] Update unsorted.dm --- code/__HELPERS/unsorted.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 92ed3965e5..aaabbef74b 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1535,8 +1535,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) D.vv_edit_var(var_name, var_value) //same result generally, unless badmemes else D.vars[var_name] = var_value -<<<<<<< HEAD -======= /proc/get_random_food() var/list/blocked = list(/obj/item/reagent_containers/food/snacks, @@ -1563,4 +1561,3 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /proc/get_random_drink() return pick(subtypesof(/obj/item/reagent_containers/food/drinks)) ->>>>>>> 1a45d35... Merge pull request #34875 from tgstation/Cyberboss-patch-5