From bba55793697e96162eccd3aadc681f279aa6046b Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 27 Oct 2020 16:34:08 -0300 Subject: [PATCH 1/5] why is this on the wrong layer? --- .../machinery/components/unary_devices/outlet_injector.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index a07f131d62..66fa084e9a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -196,7 +196,7 @@ icon_state = "inje_map-1" /obj/machinery/atmospherics/components/unary/outlet_injector/layer3 - piping_layer = 2 + piping_layer = 3 icon_state = "inje_map-2" /obj/machinery/atmospherics/components/unary/outlet_injector/on @@ -207,7 +207,7 @@ icon_state = "inje_map-1" /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3 - piping_layer = 2 + piping_layer = 3 icon_state = "inje_map-2" /obj/machinery/atmospherics/components/unary/outlet_injector/atmos From fb895cd5df70584cc336c22f7b4e92a51df1ea1f Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 27 Oct 2020 16:53:21 -0300 Subject: [PATCH 2/5] ahem, icon state. --- .../machinery/components/unary_devices/outlet_injector.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index 66fa084e9a..9aa3c8c16d 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -197,7 +197,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/layer3 piping_layer = 3 - icon_state = "inje_map-2" + icon_state = "inje_map-3" /obj/machinery/atmospherics/components/unary/outlet_injector/on on = TRUE @@ -208,7 +208,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3 piping_layer = 3 - icon_state = "inje_map-2" + icon_state = "inje_map-3" /obj/machinery/atmospherics/components/unary/outlet_injector/atmos frequency = FREQ_ATMOS_STORAGE From 76e739142b5fe984d13eb8c94b10c1f6fc338bfe Mon Sep 17 00:00:00 2001 From: Dip Date: Mon, 2 Nov 2020 16:46:34 -0300 Subject: [PATCH 3/5] Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes --- code/game/objects/items/gift.dm | 11 ++++++++++- code/modules/holiday/halloween/jacqueen.dm | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 8054d8c6a4..0afce0cdfa 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -8,6 +8,15 @@ * Gifts */ +/var/static/blacklisted_items = typecacheof(list( + /obj/item/projectile, + /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 +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)) + 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) diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 16151c4191..e3cddee90d 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -50,6 +50,13 @@ var/cached_z /// I'm busy, don't move. var/busy = FALSE + var/static/blacklisted_items = typecacheof(list( + /obj/item/projectile, + /obj/effect, + /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("[src] waves her hands, magicking up a [reward] from thin air, \"There ye are [gender], enjoy! \"") jacqrunes("There ye are [gender], enjoy!", C) From 0951e9457f8d2e6e155557f20551fb65601587a4 Mon Sep 17 00:00:00 2001 From: Dip Date: Mon, 2 Nov 2020 16:50:45 -0300 Subject: [PATCH 4/5] right, forgot that object. --- code/modules/holiday/halloween/jacqueen.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index e3cddee90d..a558c5bd0e 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -53,6 +53,7 @@ var/static/blacklisted_items = typecacheof(list( /obj/item/projectile, /obj/effect, + /obj/belly, /obj/mafia_game_board, /obj/docking_port, /obj/shapeshift_holder, From 3afd6049133235f367112372d7475581b7dc9b9e Mon Sep 17 00:00:00 2001 From: Dip Date: Wed, 4 Nov 2020 17:28:23 -0300 Subject: [PATCH 5/5] remove projectiles --- code/game/objects/items/gift.dm | 1 - code/modules/holiday/halloween/jacqueen.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 0afce0cdfa..35a68cecc6 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -9,7 +9,6 @@ */ /var/static/blacklisted_items = typecacheof(list( - /obj/item/projectile, /obj/effect, /obj/belly, /obj/mafia_game_board, diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index a558c5bd0e..90016954fc 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -51,7 +51,6 @@ /// I'm busy, don't move. var/busy = FALSE var/static/blacklisted_items = typecacheof(list( - /obj/item/projectile, /obj/effect, /obj/belly, /obj/mafia_game_board,