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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-09-07 15:57:25 -04:00
committed by GitHub
parent 33b9d0f678
commit 117138d2d4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
-4
View File
@@ -214,9 +214,7 @@
var_changes = list("gun_accuracy_mod" = 25)
custom_only = FALSE
varchange_type = TRAIT_VARCHANGE_MORE_BETTER
<<<<<<< HEAD
*/
=======
/datum/trait/negative/pain_tolerance
name = "Grit"
@@ -225,5 +223,3 @@
var_changes = list("trauma_mod" = 0.85)
excludes = list(/datum/trait/negative/neural_hypersensitivity)
can_take = ORGANICS
>>>>>>> 00381a575f... Merge pull request #13668 from Runa-Dacino/request-pain-tolerance