cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-23 13:26:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes limb damage & slight promethean rebalance (#6383)

Browse Source 
prommies are no longer invuln
fuck

they also lost their ridiculous damage modifiers and have more limb
health now.
This commit is contained in:
silicons
2024-04-15 12:28:03 -06:00
committed by GitHub
parent 57f475b453
commit 9971486566
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/external/external.dm
Vendored
+10 -5
View File
@@ -399,7 +399,10 @@
else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW))
var/overflow_brute = brute - can_inflict_brute
// keep allowing it, but, diminishing returns
var/damage_anyways_brute = brute * min(1, 1 / ((brute_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage)))
var/damage_anyways_brute = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \
overflow_brute * min(1, 1 / ((max(brute_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \
)
overflow_brute -= damage_anyways_brute
if(can_cut)
if(sharp && !edge)
create_wound( PIERCE, damage_anyways_brute )
@@ -413,11 +416,13 @@
var/can_inflict_burn = max(0, max_damage - burn_dam)
if(can_inflict_burn >= burn)
create_wound( BURN, burn )
else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW))
else
var/overflow_burn = burn - can_inflict_burn
// keep allowing it, but, diminishing returns
var/damage_anyways_burn = burn * min(1, 1 / ((burn_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage)))
create_wound( BURN, damage_anyways_burn )
var/damage_anyways_burn = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \
overflow_burn * min(1, 1 / ((max(burn_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \
)
overflow_burn -= damage_anyways_burn
create_wound(BURN, damage_anyways_burn + can_inflict_burn)
// rest goes into shock
owner.shock_stage += overflow_burn * 0.33
code/modules/organs/external/species/slime.dm
Vendored
+11 -11
View File
@@ -1,61 +1,61 @@
/obj/item/organ/external/chest/unbreakable/slime
nonsolid = 1
max_damage = 50
max_damage = 200
encased = 0
spread_dam = 1
transparent = 1
/obj/item/organ/external/groin/unbreakable/slime
nonsolid = 1
max_damage = 30
max_damage = 75
spread_dam = 1
transparent = 1
/obj/item/organ/external/arm/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/arm/right/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/leg/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/leg/right/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/foot/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/foot/right/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/hand/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
/obj/item/organ/external/hand/right/unbreakable/slime
nonsolid = 1
max_damage = 20
max_damage = 35
spread_dam = 1
transparent = 1
@@ -63,7 +63,7 @@
nonsolid = 1
cannot_gib = 0
vital = 0
max_damage = 30
max_damage = 35
encased = 0
spread_dam = 1
transparent = 1