From 936bda44dbf0570e68840e33cba0c6b666c96c7a Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sat, 14 Nov 2020 20:38:23 -0300 Subject: [PATCH 1/3] upload gift.dm --- code/game/objects/items/gift.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 35a68cecc6..11cd0b0310 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -8,13 +8,14 @@ * Gifts */ -/var/static/blacklisted_items = typecacheof(list( +GLOBAL_LIST_INIT(blacklisted_items, list( /obj/effect, /obj/belly, /obj/mafia_game_board, /obj/docking_port, /obj/shapeshift_holder, - /obj/screen)) + /obj/screen, + )) GLOBAL_LIST_EMPTY(possible_gifts) @@ -103,7 +104,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/list/gift_types_list = subtypesof(/obj/item) for(var/V in gift_types_list) var/obj/item/I = V - if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, blacklisted_items))) + if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, GLOB.blacklisted_items))) gift_types_list -= V GLOB.possible_gifts = gift_types_list var/gift_type = pick(GLOB.possible_gifts) From cbb44674ac9e56ef4259329a82670b090d1c5f3a Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Sun, 15 Nov 2020 19:10:50 -0300 Subject: [PATCH 2/3] fix + renaming global list? --- code/game/objects/items/gift.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 11cd0b0310..cba186e458 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -8,13 +8,13 @@ * Gifts */ -GLOBAL_LIST_INIT(blacklisted_items, list( +GLOBAL_LIST_INIT(gift_item_blacklist, list( /obj/effect, /obj/belly, /obj/mafia_game_board, /obj/docking_port, /obj/shapeshift_holder, - /obj/screen, + /obj/screen )) GLOBAL_LIST_EMPTY(possible_gifts) @@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/list/gift_types_list = subtypesof(/obj/item) for(var/V in gift_types_list) var/obj/item/I = V - if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, GLOB.blacklisted_items))) + if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, GLOB.gift_item_blacklist))) gift_types_list -= V GLOB.possible_gifts = gift_types_list var/gift_type = pick(GLOB.possible_gifts) From 00adf078b0caed5aa38d50df4e65e793cf72568d Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Sun, 15 Nov 2020 19:13:01 -0300 Subject: [PATCH 3/3] this is needed --- code/game/objects/items/gift.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index cba186e458..a9ed94aae9 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -8,14 +8,14 @@ * Gifts */ -GLOBAL_LIST_INIT(gift_item_blacklist, list( +GLOBAL_LIST_INIT(gift_item_blacklist, typecacheof(list( /obj/effect, /obj/belly, /obj/mafia_game_board, /obj/docking_port, /obj/shapeshift_holder, /obj/screen - )) + ))) GLOBAL_LIST_EMPTY(possible_gifts)