cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-08-09 21:35:04 +01:00
parent 407903e84b fd7272352c
commit 0c85b3a4dd
194 changed files with 43500 additions and 4442 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