Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/tools/mining_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
equip_cooldown = 15
energy_drain = 10
force = 15
harmful = TRUE
harmful = FALSE
/// Time in deciseconds it takes to drill
var/drill_delay = 7
/// Affects if it can bust through reinforced walls (DRILL_HARDENED)
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/tools/work_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/// How much damage does it apply when used
var/dam_force = 20
var/obj/mecha/working/ripley/cargo_holder
harmful = TRUE
harmful = FALSE

/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M as obj)
if(..())
Expand Down
4 changes: 2 additions & 2 deletions code/game/mecha/equipment/weapons/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
energy_drain = 30
projectile = /obj/item/projectile/plasma/adv/mech
fire_sound = 'sound/weapons/plasma_cutter.ogg'
harmful = TRUE
harmful = FALSE

/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M)
if(..()) //combat mech
Expand All @@ -177,7 +177,7 @@
energy_drain = 30
projectile = /obj/item/projectile/kinetic/mech
fire_sound = 'sound/weapons/kenetic_accel.ogg'
harmful = TRUE
harmful = FALSE

//attachable to all mechas, like the plasma cutter
/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun/can_attach(obj/mecha/M)
Expand Down