shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into system-corruption

Browse Source
This commit is contained in:
DeltaFire
2020-11-16 04:29:59 +01:00
parent 922129abd2 bf69245a58
commit 8f04d7f0d1
12 changed files with 6479 additions and 7756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/gift.dm
+4 -3
View File
@@ -8,13 +8,14 @@
* Gifts
*/
/var/static/blacklisted_items = typecacheof(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))
/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.gift_item_blacklist)))
gift_types_list -= V
GLOB.possible_gifts = gift_types_list
var/gift_type = pick(GLOB.possible_gifts)