Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-10-01 00:05:44 -05:00
parent f14272e445 0301683ae1
commit 117e5a409d
61 changed files with 846 additions and 415 deletions
@@ -266,3 +266,6 @@
 #define BODYPART_LIFE_UPDATE_HEALTH (1<<0)

 #define HUMAN_FIRE_STACK_ICON_NUM	3
+
+#define PULL_PRONE_SLOWDOWN 0.6
+#define HUMAN_CARRY_SLOWDOWN 0
@@ -31,3 +31,6 @@
 #define MOVESPEED_ID_PAI_SPACEWALK_SPEEDMOD				"PAI_SPACEWALK_MODIFIER"

 #define MOVESPEED_ID_SANITY								"MOOD_SANITY"
+
+#define MOVESPEED_ID_PRONE_DRAGGING                     "PRONE_DRAG"
+#define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"