Compat fixes

This commit is contained in:
Unknown
2021-03-09 17:28:24 -05:00
parent 1d96426c86
commit e436ca7b12
4 changed files with 0 additions and 22 deletions
@@ -23,12 +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
<<<<<<< HEAD
category = "Physical Quirks" //VOREStation Edit
=======
name = "Physical"
category = "Physical"
>>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
/datum/trait/modifier/physical/flimsy