cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for mech crusher (#26741)

Browse Source 
* E

* forgor this

* forgor this thing too

* add icons

* Update work_tools.dm

Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Update code/modules/research/designs/mechfabricator_designs.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* my beloved , gone.

* misinput!!!

* Update code/game/mecha/equipment/tools/work_tools.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Review compliance

* Update work_tools.dm

* Update work_tools.dm

* more fixes

* Update work_tools.dm

---------

Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
MLGTASTICa
2024-09-11 13:42:32 +00:00
committed by GitHub
co-authored by 1080pCat warriorstar-orion
parent fbcdb2375b
commit 80fbaf5632
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/tools/work_tools.dm
+7 -5
View File
@@ -459,15 +459,15 @@
name = "exosuit crusher"
desc = "A mech mounted crusher. For crushing bigger things."
icon_state = "mecha_crusher"
equip_cooldown = 15
equip_cooldown = 1.2 SECONDS
energy_drain = 3000
harmful = TRUE
range = MECHA_MELEE | MECHA_RANGED
var/obj/item/kinetic_crusher/mecha/internal_crusher
/obj/item/kinetic_crusher/mecha
force = 15
force_wielded = 30
/// Since this one doesn't have the two_handed component it will always use the value in force
force = 30
armour_penetration_flat = 15
detonation_damage = 90
backstab_bonus = 50
@@ -483,6 +483,7 @@
unwanted?.RemoveComponent()
unwanted = GetComponent(/datum/component/two_handed)
unwanted?.RemoveComponent()
/// This is only for the sake of internal checks in the crusher itself.
ADD_TRAIT(src, TRAIT_WIELDED, "mech[UID()]")
/obj/item/mecha_parts/mecha_equipment/mech_crusher/Initialize(mapload)
@@ -498,9 +499,10 @@
return
if(!chassis.occupant)
return
chassis.occupant.changeNext_click(equip_cooldown)
var/proximate = chassis.Adjacent(target)
if(ismob(target))
internal_crusher.attack(target, chassis.occupant)
if(proximate)
target.attackby(internal_crusher, chassis.occupant)
internal_crusher.afterattack(target, chassis.occupant, proximate, null)
#undef MECH_RCD_MODE_DECONSTRUCT