From 3c60d9eea4b41a6efbf193b00f5fae6dd512ff3e Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:40:59 -0700 Subject: [PATCH 1/3] mandatory blacklisting of certain items no comment required. --- .../modules/ghost_players/job_helpers/firing_range_helper.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm index b9a50acc9194..393ab3664659 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm @@ -39,6 +39,8 @@ /obj/item/ammo_box/magazine/sniper_rounds/penetrator, /obj/item/ammo_box/magazine, /obj/item/ammo_box/magazine/toy, + /obj/item/gun/energy/recharge/kinetic_accelerator/meme, + /obj/item/gun/energy/recharge/kinetic_accelerator/meme/nonlethal, ) blacklisted_types = list( /obj/item/ammo_box/magazine/internal, From 39c1905d7c0f5181b84445966369be3b95563bd8 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:03:57 -0700 Subject: [PATCH 2/3] fix and refix --- code/modules/clothing/chameleon.dm | 2 +- .../modules/ghost_players/job_helpers/firing_range_helper.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 421a50b8a108..788ffa6469c0 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -903,7 +903,7 @@ chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/gun chameleon_action.chameleon_name = "Gun" - chameleon_action.chameleon_blacklist = typecacheof(/obj/item/gun/energy/minigun) + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/gun/energy/minigun, /obj/item/gun/energy/recharge/kinetic_accelerator/meme), only_root_path = TRUE) chameleon_action.initialize_disguises() add_item_action(chameleon_action) diff --git a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm index 393ab3664659..fbb33c553d50 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/firing_range_helper.dm @@ -39,8 +39,6 @@ /obj/item/ammo_box/magazine/sniper_rounds/penetrator, /obj/item/ammo_box/magazine, /obj/item/ammo_box/magazine/toy, - /obj/item/gun/energy/recharge/kinetic_accelerator/meme, - /obj/item/gun/energy/recharge/kinetic_accelerator/meme/nonlethal, ) blacklisted_types = list( /obj/item/ammo_box/magazine/internal, @@ -53,6 +51,7 @@ /obj/item/gun/magic/wand/death, /obj/item/gun/magic/wand/safety, /obj/item/gun/medbeam, + /obj/item/gun/energy/recharge/kinetic_accelerator/meme, ) /obj/structure/centcom_item_spawner/gun_and_ammo_creator/spawn_chosen_item(type_to_spawn) From df0e4286882cc59c09310136f68888ec3298f1fb Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:19:12 -0700 Subject: [PATCH 3/3] smooth brains --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 788ffa6469c0..87361f8d9d7d 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -903,7 +903,7 @@ chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/gun chameleon_action.chameleon_name = "Gun" - chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/gun/energy/minigun, /obj/item/gun/energy/recharge/kinetic_accelerator/meme), only_root_path = TRUE) + chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/gun/energy/minigun, /obj/item/gun/energy/recharge/kinetic_accelerator/meme), only_root_path = TRUE) //MONKESTATION EDIT - no, i dont trust people even with it as a chameleon appearance. admins dont want no bwoinkerino. chameleon_action.initialize_disguises() add_item_action(chameleon_action)