cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1434 from CHOMPStationBot/upstream-merge-9772

Browse Source 
[MIRROR] [MIRROR] Sideports a couple of init unit tests from Neb.
This commit is contained in:
cadyn
2021-02-27 15:48:24 -08:00
committed by GitHub
parent 695fc3db7d e8852a363f
commit 20722857c8
129 changed files with 619 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/traits/trait_defines.dm
+3 -1
View File
@@ -23,7 +23,8 @@
// Physical traits are what they sound like, and involve the character's physical body, as opposed to their mental state.
/datum/trait/modifier/physical
category = "Physical Quirks" //VOREStation Edit
name = "Physical"
category = "Physical"
/datum/trait/modifier/physical/flimsy
@@ -194,6 +195,7 @@
// 'Mental' traits are just those that only sapients can have, for now, and generally involves fears.
// So far, all of them are just for fluff/don't have mechanical effects.
/datum/trait/modifier/mental
name = "Mental"
category = "Mental"
/datum/trait/modifier/mental/test_for_invalidity(var/datum/category_item/player_setup_item/traits/setup)