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

Addresses limb meta with a few balance changes. (#12348)

Browse Source
This commit is contained in:
Matt Atlas
2021-08-24 18:34:38 +02:00
committed by GitHub
parent aeb3c7ad53
commit e193074f48
8 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+4 -3
View File
@@ -86,7 +86,7 @@
var/body_hair
var/painted = 0
var/maim_bonus = 0.75 //For special projectile gibbing calculation, dubbed "maiming"
var/maim_bonus = 0 //For special projectile gibbing calculation, dubbed "maiming"
var/list/genetic_markings // Markings (body_markings) to apply to the icon
var/list/temporary_markings // Same as above, but not preserved when cloning
@@ -403,12 +403,13 @@
if(isitem(used_weapon))
var/obj/item/W = used_weapon
var/dam_flags = W.damage_flags()
if(isprojectile(W))
var/obj/item/projectile/P = W
if(P.damage_flags & DAM_BULLET)
if(dam_flags & DAM_BULLET)
blunt_eligible = TRUE
maim_bonus += P.maim_rate
else if(W.w_class >= w_class && edge)
if(W.w_class >= w_class && (dam_flags & DAM_EDGE))
edge_eligible = TRUE
if(!blunt_eligible && edge_eligible && brute >= max_damage / (DROPLIMB_THRESHOLD_EDGE + maim_bonus))
code/modules/organs/subtypes/standard.dm
+5 -7
View File
@@ -53,7 +53,7 @@
limb_name = BP_L_ARM
name = "left arm"
icon_name = "l_arm"
max_damage = 50
max_damage = 75
min_broken_damage = 30
w_class = ITEMSIZE_NORMAL
body_part = ARM_LEFT
@@ -86,7 +86,7 @@
limb_name = BP_L_LEG
name = "left leg"
icon_name = "l_leg"
max_damage = 50
max_damage = 75
min_broken_damage = 30
w_class = ITEMSIZE_NORMAL
body_part = LEG_LEFT
@@ -119,7 +119,7 @@
limb_name = BP_L_FOOT
name = "left foot"
icon_name = "l_foot"
max_damage = 35
max_damage = 55
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
body_part = FOOT_LEFT
@@ -129,7 +129,6 @@
amputation_point = "left ankle"
arterial_bleed_severity = 0.5
limb_flags = ORGAN_CAN_AMPUTATE | ORGAN_CAN_BREAK | ORGAN_CAN_MAIM | ORGAN_CAN_STAND
maim_bonus = 1
augment_limit = 1
/obj/item/organ/external/foot/body_part_class()
@@ -157,7 +156,7 @@
limb_name = BP_L_HAND
name = "left hand"
icon_name = "l_hand"
max_damage = 35
max_damage = 55
min_broken_damage = 15
w_class = ITEMSIZE_SMALL
body_part = HAND_LEFT
@@ -167,7 +166,6 @@
amputation_point = "left wrist"
arterial_bleed_severity = 0.5
limb_flags = ORGAN_CAN_AMPUTATE | ORGAN_CAN_BREAK | ORGAN_CAN_MAIM | ORGAN_CAN_GRASP | ORGAN_HAS_TENDON
maim_bonus = 1
augment_limit = 1
/obj/item/organ/external/hand/body_part_class()
@@ -202,7 +200,7 @@
limb_name = BP_HEAD
icon_name = "head"
name = BP_HEAD
max_damage = 75
max_damage = 125
min_broken_damage = 35
w_class = ITEMSIZE_NORMAL
body_part = HEAD | FACE