[MIRROR] Pacifists can no longer cause harm using mech equipment (#5921)
* Pacifists can no longer cause harm using mech equipment (#36293) * Fixes pacifists from firing mech weapons that cause harm * Pacifists can still use mining equipment on non-living objects * I'm a big ol dumbo that forgot how booleans are handled * missed one * forgot to save file before commit. Now all booleans are fixed * CAPS * Pacifists can't drill, clamp, or melee hit a closed locker or crate. prevents them from killing people inside them * Pacifists now know if a container has a living being in it and will not drill, clamp, or melee it if it does. * made change as requested by duncathan * added an exception to the hydraulic clamp so that it can pick up containers with people in them. * Pacifists can no longer cause harm using mech equipment
This commit is contained in:
committed by
Poojawa
parent
12085591bf
commit
f9c1114ec1
@@ -9,6 +9,7 @@
|
||||
equip_cooldown = 15
|
||||
energy_drain = 10
|
||||
force = 15
|
||||
pacifist_safe = FALSE
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/drill/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
energy_drain = 10
|
||||
var/dam_force = 20
|
||||
var/obj/mecha/working/ripley/cargo_holder
|
||||
pacifist_safe = FALSE
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M as obj)
|
||||
if(..())
|
||||
|
||||
Reference in New Issue
Block a user