Fix a few chomp-specific typepaths and a marge conflict

This commit is contained in:
Raeschen
2023-06-21 08:26:10 +02:00
parent ed323a6950
commit ef98e7f4ea
3 changed files with 2 additions and 1035 deletions
@@ -23,7 +23,7 @@
/obj/item/weapon/circuitboard,
/obj/item/weapon/smes_coil,
/obj/item/weapon/fuel_assembly,
/obj/item/weapon/ore/bluespace_crystal
/obj/item/weapon/bluespace_crystal
) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
var/obj/item/wrapped = null // Item currently being held.