mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Combat Mechs Can Punch More Things (#6303)
* Combat Mechs Can Punch More Things Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage). Gives punching objects a check so you don't accidently smash something without meaning to. Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs. * Take_Damage Boogaloo * More take_damage Stuff Adds click delay on attacking barriers. Proper noises when attacking material doors and barricades. More stuff can be broken by mech punch and simple mobs. * Adds changelong * usr to user
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
H.take_damage(rand(10,30))
|
||||
qdel()
|
||||
|
||||
/obj/item/modular_computer/proc/take_damage(var/amount, var/component_probability, var/damage_casing = 1, var/randomize = 1)
|
||||
/obj/item/modular_computer/take_damage(var/amount, var/component_probability, var/damage_casing = 1, var/randomize = 1)
|
||||
if(randomize)
|
||||
// 75%-125%, rand() works with integers, apparently.
|
||||
amount *= (rand(75, 125) / 100.0)
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
to_chat(user, "It seems to be slightly damaged.")
|
||||
|
||||
// Damages the component. Contains necessary checks. Negative damage "heals" the component.
|
||||
/obj/item/weapon/computer_hardware/proc/take_damage(var/amount)
|
||||
/obj/item/weapon/computer_hardware/take_damage(var/amount)
|
||||
damage += round(amount) // We want nice rounded numbers here.
|
||||
damage = between(0, damage, max_damage) // Clamp the value.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user