Move some Monkestation-specific traits to monkestation declarations.dm

LikeLakers2 · Jun 23, 2024 · 3807507 · 3807507
1 parent 00e2be6
commit 3807507
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/code/__DEFINES/traits/old_traits.dm b/code/__DEFINES/traits/old_traits.dm
@@ -262,20 +262,6 @@
 #define SPEAKING_FROM_HANDS "hands"
 
 #define GLUED_ITEM_TRAIT "glued-item"
-
-//monkestation edit start
-/// One can breath under water, you get me?
-#define TRAIT_WATER_BREATHING "water_breathing"
-
-/// Does not take damage from bloodloss(or any blood shenanigans)
-#define TRAIT_NO_BLOODLOSS_DAMAGE "no_bloodloss_damage"
-
-/// Do IPC's dream of doomsday? The answer is yes
-#define TRAIT_ROBOT_CAN_BLEED "robots_can_bleed"
-
-/// tough feets for the satyrs
-#define TRAIT_HARD_SOLES "hard_soles" //Taken from Skyrat
-//monkestation edit end
 // unique trait sources, still defines
 #define EMP_TRAIT "emp_trait"
 

diff --git a/code/__DEFINES/~monkestation/traits/declarations.dm b/code/__DEFINES/~monkestation/traits/declarations.dm
@@ -1,5 +1,17 @@
 // BEGIN TRAIT DEFINES
 
+/// One can breath under water, you get me?
+#define TRAIT_WATER_BREATHING "water_breathing"
+
+/// Does not take damage from bloodloss(or any blood shenanigans)
+#define TRAIT_NO_BLOODLOSS_DAMAGE "no_bloodloss_damage"
+
+/// Do IPC's dream of doomsday? The answer is yes
+#define TRAIT_ROBOT_CAN_BLEED "robots_can_bleed"
+
+/// tough feets for the satyrs
+#define TRAIT_HARD_SOLES "hard_soles" //Taken from Skyrat
+
 /// Given to Clockwork Golems, gives them a reduction on invoke time for certain scriptures
 #define TRAIT_FASTER_SLAB_INVOKE "faster_slab_invoke"
 /// Has an item been enchanted by a clock cult Stargazer