cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3913 from Rykka-Stormheart/shep-dev-tankiness-buff

Browse Source 
Trait Addition + Adjustments (Tankiness++)
This commit is contained in:
Razgriz
2022-03-29 14:48:35 -07:00
committed by GitHub
parent 91ff52fa7d 80a60eb7a3
commit e18c0203b5
8 changed files with 99 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/organ.dm
View File

@@ -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.

2
code/modules/organs/organ_external.dm
View File

@@ -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"

14
code/modules/organs/subtypes/standard.dm
View File

@@ -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

6
code/modules/organs/subtypes/unathi.dm
View File

@@ -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