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

Merge pull request #13654 from ArchieBeepBoop/giftfix

Browse Source 
Christmas Tree / Jacqueen Gift Blacklist
This commit is contained in:
silicons
2020-11-07 00:32:09 -07:00
committed by GitHub
parent 693b6cfac1 3afd604913
commit 577cd537b3
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/gift.dm
View File

@@ -8,6 +8,14 @@
* Gifts
*/
/var/static/blacklisted_items = typecacheof(list(
/obj/effect,
/obj/belly,
/obj/mafia_game_board,
/obj/docking_port,
/obj/shapeshift_holder,
/obj/screen))
GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/a_gift
@@ -95,7 +103,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))
if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, blacklisted_items)))
gift_types_list -= V
GLOB.possible_gifts = gift_types_list
var/gift_type = pick(GLOB.possible_gifts)

18
code/modules/holiday/halloween/jacqueen.dm
View File

@@ -50,6 +50,13 @@
var/cached_z
/// I'm busy, don't move.
var/busy = FALSE
var/static/blacklisted_items = typecacheof(list(
/obj/effect,
/obj/belly,
/obj/mafia_game_board,
/obj/docking_port,
/obj/shapeshift_holder,
/obj/screen))
/mob/living/simple_animal/jacq/Initialize()
..()
@@ -112,7 +119,7 @@
/mob/living/simple_animal/jacq/proc/jacqrunes(message, mob/living/carbon/C) //Displays speechtext over Jacq for the user only.
var/atom/hearer = C
var/list/spans = list("spooky")
var/list/spans = list("spooky")
new /datum/chatmessage(message, src, hearer, spans)
@@ -228,10 +235,13 @@
return
var/new_obj = pick(subtypesof(/obj))
//for(var/item in blacklist)
// if(new_obj == item)
// panic()
for(var/item in blacklisted_items)
if(is_type_in_typecache(new_obj, blacklisted_items))
new_obj = /obj/item/reagent_containers/food/snacks/special_candy
var/reward = new new_obj(C.loc)
if(new_obj == /obj/item/reagent_containers/food/snacks/special_candy)
new new_obj(C.loc)
new new_obj(C.loc) //Giving them back their candies in case it's something from the blacklist or if the game literally rolled candies. What rotten luck.
C.put_in_hands(reward)
visible_message("<b>[src]</b> waves her hands, magicking up a [reward] from thin air, <span class='spooky'>\"There ye are [gender], enjoy! \"</span>")
jacqrunes("There ye are [gender], enjoy!", C)