Merge pull request #9815 from VOREStation/upstream-merge-7927

[MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.
This commit is contained in:
Novacat
2021-03-09 17:40:51 -05:00
committed by GitHub
7 changed files with 25 additions and 20 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