Merge pull request #723 from DexeeXI/immediate-fix

Correction to Centcom Firing Range (and small fix)
Monkestation · Dec 15, 2023 · 76ed5b6 · 76ed5b6
2 parents cf3b7b1 + df0e428
commit 76ed5b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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) //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)
 

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
@@ -51,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)