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

Merge pull request #940 from cadyn/fixtraits

Browse Source 
Fix broken ass trait bullshit
This commit is contained in:
Razgriz
2020-11-30 23:16:33 -07:00
committed by GitHub
parent d2a21b1315 c69d43a3ed
commit bc04558f0d
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm
+17 -1
View File
@@ -7,7 +7,7 @@
/datum/trait/densebones
name = "Dense bones"
desc = "Your bones (or robotic limbs) are more dense or stronger then what is considered normal. It is much harder to fracture your bones, yet pain from fractures is much more intense."
cost = 2
cost = 3
excludes = list(/datum/trait/hollow)
/datum/trait/densebones/apply(var/datum/species/S,var/mob/living/carbon/human/H)
@@ -108,6 +108,22 @@
special_env = TRUE
excludes = list(/datum/trait/slipperydirt)
/datum/trait/endurance_high
cost = 3
excludes = list(/datum/trait/brute_resist, /datum/trait/minor_brute_resist, /datum/trait/minor_burn_resist, /datum/trait/burn_resist)
/datum/trait/brute_resist
excludes = list(/datum/trait/minor_brute_resist, /datum/trait/burn_resist, /datum/trait/endurance_high)
/datum/trait/minor_brute_resist
excludes = list(/datum/trait/brute_resist, /datum/trait/endurance_high)
/datum/trait/burn_resist
excludes = list(/datum/trait/minor_burn_resist, /datum/trait/brute_resist, /datum/trait/endurance_high)
/datum/trait/minor_burn_resist
excludes = list(/datum/trait/burn_resist, /datum/trait/endurance_high)
/datum/trait/absorbent/handle_environment_special(var/mob/living/carbon/human/H)
var/turf/T = get_turf(H)
if(istype(T))