cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Protean Tankiness nerf

Browse Source
This commit is contained in:
BlackMajor
2022-08-23 00:09:10 +12:00
parent e19cc2ebff
commit 44edd5178b
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+7 -7
View File
@@ -10,7 +10,7 @@
var/total_burn = 0
var/total_brute = 0
for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit
if((O.robotic >= ORGAN_ROBOT) && !O.vital)
if((O.robotic >= ORGAN_ROBOT) && !O.vital && !(O.robotic ==ORGAN_NANOFORM)) //CHOMPEdit - Protean changes
continue //*non-vital* robot limbs don't count towards shock and crit
total_brute += O.brute_dam
total_burn += O.burn_dam
@@ -68,7 +68,7 @@
/mob/living/carbon/human/getBruteLoss()
var/amount = 0
for(var/obj/item/organ/external/O in organs)
if(O.robotic >= ORGAN_ROBOT && !O.vital)
if(O.robotic >= ORGAN_ROBOT && !O.vital && !(O.robotic ==ORGAN_NANOFORM)) //CHOMPEdit - Protean changes
continue //*non-vital*robot limbs don't count towards death, or show up when scanned
amount += O.brute_dam
return amount
@@ -90,7 +90,7 @@
/mob/living/carbon/human/getFireLoss()
var/amount = 0
for(var/obj/item/organ/external/O in organs)
if(O.robotic >= ORGAN_ROBOT && !O.vital)
if(O.robotic >= ORGAN_ROBOT && !O.vital && !(O.robotic ==ORGAN_NANOFORM)) //CHOMPEdit - Protean changes
continue //*non-vital*robot limbs don't count towards death, or show up when scanned
amount += O.burn_dam
return amount
@@ -302,7 +302,7 @@
halloss = 0
else
..()
/mob/living/carbon/human/Stun(var/amount)
if(amount > 0) //only multiply it by the mod if it's positive, or else it takes longer to fade too!
amount = amount*species.stun_mod
@@ -310,12 +310,12 @@
/mob/living/carbon/human/SetStunned(var/amount)
..()
/mob/living/carbon/human/AdjustStunned(var/amount)
if(amount > 0) // Only multiply it if positive.
amount = amount*species.stun_mod
..(amount)
/mob/living/carbon/human/Weaken(var/amount)
if(amount > 0) //only multiply it by the mod if it's positive, or else it takes longer to fade too!
amount = amount*species.weaken_mod
@@ -323,7 +323,7 @@
/mob/living/carbon/human/SetWeakened(var/amount)
..()
/mob/living/carbon/human/AdjustWeakened(var/amount)
if(amount > 0) // Only multiply it if positive.
amount = amount*species.weaken_mod
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_organs.dm
+12 -12
View File
@@ -4,77 +4,77 @@
encased = FALSE
max_damage = 100 // <-- This is different from the rest
min_broken_damage = 1000
vital = TRUE // <-- This is different from the rest
vital = 1
model = "protean"
/obj/item/organ/external/groin/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 100 // <-- This is different from the rest
max_damage = 100
min_broken_damage = 1000 //Multiple
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/head/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 100
min_broken_damage = 1000 //Inheritance
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/arm/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000 //Please
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/arm/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/leg/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/leg/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/hand/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/hand/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/foot/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/foot/right/unbreakable/nano
robotic = ORGAN_NANOFORM
encased = FALSE
max_damage = 65
min_broken_damage = 1000
vital = FALSE
vital = 0
model = "protean"
/obj/item/organ/external/head/unbreakable/nano/disfigure()