shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into mobility_flags

Browse Source
This commit is contained in:
kevinz000
2020-01-27 23:35:35 -07:00
parent 6e31db958c 5e10d297e1
commit 611fd7ea89
323 changed files with 16725 additions and 11570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm
+5 -2
View File
@@ -12,8 +12,11 @@
/mob/living/carbon/human/movement_delay()
. = 0
if((mobility_flags & MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && !sprinting)
. += 1
if((mobility_flags & MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && sprinting)
var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI
if(!SSI)
SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase)
. -= SSI.config_entry_value
if(wrongdirmovedelay)
. += 1
. += ..()
modular_citadel/code/modules/mob/living/living.dm
+6
View File
@@ -17,6 +17,12 @@
var/sprint_stamina_cost = 0.70 //stamina loss per tile while insufficient sprint buffer.
//---End
/mob/living/update_config_movespeed()
. = ..()
sprint_buffer_max = CONFIG_GET(number/movedelay/sprint_buffer_max)
sprint_buffer_regen_ds = CONFIG_GET(number/movedelay/sprint_buffer_regen_per_ds)
sprint_stamina_cost = CONFIG_GET(number/movedelay/sprint_stamina_cost)
/mob/living/movement_delay(ignorewalk = 0)
. = ..()
if(!CHECK_BITFIELD(mobility_flags, MOBILITY_STAND))