This commit is contained in:
r4d6
2019-12-23 13:30:42 -05:00
parent 54b3e3603e
commit e17d32199d
908 changed files with 6472 additions and 17340 deletions
@@ -615,11 +615,6 @@
return
..()
/obj/item/electronic_assembly/can_trigger_gun(mob/living/user) //sanity checks against pocket death weapon circuits
if(!can_fire_equipped || !user.is_holding(src))
return FALSE
return ..()
/obj/item/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves.
name = "type-a electronic assembly"
@@ -402,8 +402,3 @@ a creative player the means to solve many problems. Circuits are held inside an
return TRUE
return FALSE
/obj/item/integrated_circuit/can_trigger_gun(mob/living/user)
if(!user.is_holding(src))
return FALSE
return ..()