shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12063 from Citadel-Station-13/kevinz000-patch-6

Browse Source 
Disables hardmode citadel combat
This commit is contained in:
Ghom
2020-04-30 18:20:17 +02:00
committed by GitHub
parent a90a246076 e6e2277634
commit 373cafd60b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/damage_procs.dm
+1 -1
View File
@@ -38,7 +38,7 @@
adjustCloneLoss(damage_amount, forced = forced)
if(STAMINA)
if(BP)
if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount)))
if(damage > 0 ? BP.receive_damage(0, 0, damage_amount) : BP.heal_damage(0, 0, abs(damage_amount), FALSE, FALSE))
update_damage_overlays()
else
adjustStaminaLoss(damage_amount, forced = forced)
modular_citadel/code/modules/mob/living/carbon/damage_procs.dm
+1 -1
View File
@@ -15,7 +15,7 @@
if(!forced && (status_flags & GODMODE))
return FALSE
var/obj/item/bodypart/BP = isbodypart(affected_zone)? affected_zone : (get_bodypart(check_zone(affected_zone)) || bodyparts[1])
if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount)))
if(amount > 0? BP.receive_damage(0, 0, amount * incomingstammult) : BP.heal_damage(0, 0, abs(amount), FALSE, FALSE))
update_damage_overlays()
if(updating_health)
updatehealth()