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

Conflicts sure are !!FUN!!

Browse Source 
Also adds dolphin gloves to the glove crate, and fixes fortitude
This commit is contained in:
Artur
2020-04-15 12:33:59 +03:00
parent 2134515d5c
commit ddcfcb5cd8
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/antagonists/bloodsucker/powers/fortitude.dm
View File

@@ -11,6 +11,7 @@
bloodsucker_can_buy = TRUE
amToggle = TRUE
warn_constant_cost = TRUE
var/was_running
var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS.
@@ -27,10 +28,11 @@
fortitude_resist = max(0.3, 0.7 - level_current * 0.1)
H.physiology.brute_mod *= fortitude_resist
H.physiology.burn_mod *= fortitude_resist
var/was_running = (user.m_intent == MOVE_INTENT_RUN)
was_running = (user.m_intent == MOVE_INTENT_RUN)
if(was_running)
user.toggle_move_intent()
while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
was_running = TRUE
while(B && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
if(istype(user.buckled, /obj/vehicle)) //We dont want people using fortitude being able to use vehicles
var/obj/vehicle/V = user.buckled
var/datum/component/riding/VRD = V.GetComponent(/datum/component/riding)
@@ -57,3 +59,6 @@
var/mob/living/carbon/human/H = owner
H.physiology.brute_mod /= fortitude_resist
H.physiology.burn_mod /= fortitude_resist
if(was_running && user.m_intent == MOVE_INTENT_WALK)
user.toggle_move_intent()