cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Combat Mechs Can Punch More Things (#6303)

Browse Source 
* 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:
Andrew
2019-07-24 17:00:24 -04:00
committed by VirgoBot
parent 4c71587410
commit e4deaa6478
27 changed files with 267 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
+1 -1
View File
@@ -292,7 +292,7 @@ var/list/organ_cache = list()
W.time_inflicted = world.time
//Note: external organs have their own version of this proc
/obj/item/organ/proc/take_damage(amount, var/silent=0)
/obj/item/organ/take_damage(amount, var/silent=0)
if(src.robotic >= ORGAN_ROBOT)
src.damage = between(0, src.damage + (amount * 0.8), max_damage)
else