cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

dreamchecker (#8233)

Browse Source 
Implements dreamchecker plus fixes all errors
This commit is contained in:
mikomyazaki
2020-02-16 20:42:32 +02:00
committed by GitHub
parent d08b2ab609
commit 6074224d00
122 changed files with 282 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -242,7 +242,7 @@
/obj/item/organ/external/proc/is_damageable(var/additional_damage = 0)
return (vital || brute_dam + burn_dam + additional_damage < max_damage)
/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), damage_flags)
/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), damage_flags, var/silent)
if((brute <= 0) && (burn <= 0))
return 0
code/modules/organs/subtypes/standard.dm
+2 -2
View File
@@ -177,8 +177,8 @@
owner.update_hair()
..()
/obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), damage_flags)
..(brute, burn, sharp, edge, used_weapon, forbidden_limbs, damage_flags)
/obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), damage_flags, var/silent)
..(brute, burn, sharp, edge, used_weapon, forbidden_limbs, damage_flags, silent)
if (!disfigured)
if (brute_dam > 40)
if (prob(50))