mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Increases High Endurance cost to 3, VHE to 6, and adds EHE for 9
Also adjusts organ break damage across the board. Unathi are TANKY BOIS. 80 damage to break their chest/groin compared to 60 on most, and 70 for head, compared to 50 for most.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
name = "Haste"
|
||||
desc = "Allows you to move faster on average than baseline."
|
||||
cost = 4 //CHOMPEdit
|
||||
var_changes = list("slowdown" = -0.5)
|
||||
var_changes = list("slowdown" = -0.45)
|
||||
excludes = list(/datum/trait/positive/hardy,/datum/trait/positive/hardy_extreme,/datum/trait/positive/hardy_plus,/datum/trait/positive/speed_fast_minor)
|
||||
|
||||
//ChompEdit
|
||||
@@ -46,7 +46,7 @@
|
||||
/datum/trait/positive/endurance_high
|
||||
name = "High Endurance"
|
||||
desc = "Increases your maximum total hitpoints to 125. You require 250 damage in total to die, compared to 200 normally. You will still go into crit after losing 125 HP, compared to crit at 100 HP." // CHOMPEdit: Clarity for players' sake.
|
||||
cost = 2
|
||||
cost = 3 // CHOMPEdit
|
||||
var_changes = list("total_health" = 125)
|
||||
|
||||
/datum/trait/positive/endurance_high/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
||||
|
||||
@@ -269,7 +269,7 @@
|
||||
/datum/trait/positive/endurance_very_high
|
||||
name = "Very High Endurance"
|
||||
desc = "Increases your maximum total hitpoints to 150. You require 300 damage in total to die, compared to 200 normally. You will still go into crit after losing 150 HP, compared to crit at 100 HP."
|
||||
cost = 4 // This should cost a LOT, because your total health becomes 300 to be fully dead, rather than 200 normally, or 250 for High Endurance. HE costs 2, double it here. (It could safely be bumped up to 6, imo, but start at 4.)
|
||||
cost = 6 // This should cost a LOT, because your total health becomes 300 to be fully dead, rather than 200 normally, or 250 for High Endurance. HE costs 2, double it here.
|
||||
var_changes = list("total_health" = 150)
|
||||
excludes = list(/datum/trait/positive/endurance_high)
|
||||
|
||||
@@ -277,18 +277,16 @@
|
||||
..(S,H)
|
||||
H.setMaxHealth(S.total_health)
|
||||
|
||||
/*
|
||||
|
||||
/datum/trait/positive/endurance_extremely_high
|
||||
name = "Extremely High Endurance"
|
||||
desc = "Increases your maximum total hitpoints to 175"
|
||||
cost = 6 // This should cost a LOT, because your total health becomes 350 to be fully dead, rather than 200 normally, or 250 for High Endurance. HE costs 2, this costs 3x it.
|
||||
cost = 9 // This should cost a LOT, because your total health becomes 350 to be fully dead, rather than 200 normally, or 250 for High Endurance. HE costs 2, this costs 3x it.
|
||||
var_changes = list("total_health" = 175)
|
||||
|
||||
/datum/trait/positive/endurance_extremely_high/apply(var/datum/species/S,var/mob/living/carbon/human/H)
|
||||
..(S,H)
|
||||
H.setMaxHealth(S.total_health)
|
||||
*/
|
||||
// Commenting this one out, but leaving in for balance discussion purposes.
|
||||
|
||||
/datum/trait/positive/pain_tolerance_advanced // High Pain Intolerance is 50% incoming pain, but this is 40% reduced incoming pain.
|
||||
name = "Increased Pain Tolerance"
|
||||
|
||||
@@ -28,7 +28,7 @@ var/list/organ_cache = list()
|
||||
|
||||
// Damage vars.
|
||||
var/min_bruised_damage = 10 // Damage before considered bruised
|
||||
var/min_broken_damage = 30 // Damage before becoming broken
|
||||
var/min_broken_damage = 60 // Damage before becoming broken CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
var/max_damage // Damage cap
|
||||
var/can_reject = 1 // Can this organ reject?
|
||||
var/rejecting // Is this organ already being rejected?
|
||||
@@ -361,7 +361,7 @@ var/list/organ_cache = list()
|
||||
robotize()
|
||||
robotic = ORGAN_ASSISTED
|
||||
min_bruised_damage = 15
|
||||
min_broken_damage = 35
|
||||
min_broken_damage = 60 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
butcherable = FALSE
|
||||
|
||||
/obj/item/organ/proc/digitize() //Used to make the circuit-brain. On this level in the event more circuit-organs are added/tweaks are wanted.
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
/obj/item/organ/external
|
||||
name = "external"
|
||||
min_broken_damage = 30
|
||||
min_broken_damage = 60 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
max_damage = 0
|
||||
dir = SOUTH
|
||||
organ_tag = "limb"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
organ_tag = BP_TORSO
|
||||
icon_name = "torso"
|
||||
max_damage = 100
|
||||
min_broken_damage = 35
|
||||
min_broken_damage = 60 // CHOMPEdit: Increase all min_broken_damage (Ribs should take more force to break)
|
||||
w_class = ITEMSIZE_HUGE
|
||||
body_part = UPPER_TORSO
|
||||
vital = 1
|
||||
@@ -59,7 +59,7 @@
|
||||
organ_tag = BP_GROIN
|
||||
icon_name = "groin"
|
||||
max_damage = 100
|
||||
min_broken_damage = 35
|
||||
min_broken_damage = 50 // CHOMPEdit: Increase all min_broken_damage
|
||||
w_class = ITEMSIZE_LARGE
|
||||
body_part = LOWER_TORSO
|
||||
vital = 1
|
||||
@@ -89,7 +89,7 @@
|
||||
name = "left arm"
|
||||
icon_name = "l_arm"
|
||||
max_damage = 80
|
||||
min_broken_damage = 30
|
||||
min_broken_damage = 40 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
body_part = ARM_LEFT
|
||||
parent_organ = BP_TORSO
|
||||
@@ -129,7 +129,7 @@
|
||||
name = "left leg"
|
||||
icon_name = "l_leg"
|
||||
max_damage = 80
|
||||
min_broken_damage = 30
|
||||
min_broken_damage = 40 // CHOMPEdit: Increase all min_broken_damage
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
body_part = LEG_LEFT
|
||||
icon_position = LEFT
|
||||
@@ -168,7 +168,7 @@
|
||||
name = "left foot"
|
||||
icon_name = "l_foot"
|
||||
max_damage = 50
|
||||
min_broken_damage = 15
|
||||
min_broken_damage = 30 // CHOMPEdit: Increase all min_broken_damage
|
||||
w_class = ITEMSIZE_SMALL
|
||||
body_part = FOOT_LEFT
|
||||
icon_position = LEFT
|
||||
@@ -213,7 +213,7 @@
|
||||
name = "left hand"
|
||||
icon_name = "l_hand"
|
||||
max_damage = 50
|
||||
min_broken_damage = 15
|
||||
min_broken_damage = 30 // CHOMPEdit: Increase all min_broken_damage
|
||||
w_class = ITEMSIZE_SMALL
|
||||
body_part = HAND_LEFT
|
||||
parent_organ = BP_L_ARM
|
||||
@@ -262,7 +262,7 @@
|
||||
name = "head"
|
||||
slot_flags = SLOT_BELT
|
||||
max_damage = 75
|
||||
min_broken_damage = 35
|
||||
min_broken_damage = 50 // CHOMPEdit: Increase all min_broken_damage
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
body_part = HEAD
|
||||
vital = 1
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
/obj/item/organ/external/chest/unathi
|
||||
max_damage = 100
|
||||
min_broken_damage = 40
|
||||
min_broken_damage = 80 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
encased = "upper ribplates"
|
||||
|
||||
/obj/item/organ/external/groin/unathi
|
||||
max_damage = 100
|
||||
min_broken_damage = 40
|
||||
min_broken_damage = 80 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
encased = "lower ribplates"
|
||||
|
||||
/obj/item/organ/external/head/unathi
|
||||
max_damage = 75
|
||||
min_broken_damage = 35
|
||||
min_broken_damage = 70 // CHOMPEdit: Flat doubling of all min_broken_damage
|
||||
eye_icon = "eyes_s"
|
||||
force = 5
|
||||
throwforce = 10
|
||||
|
||||
Reference in New Issue
Block a user