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

Update species.dm

Browse Source
This commit is contained in:
kevinz000
2020-02-04 03:46:13 -07:00
committed by GitHub
parent d17472b8f2
commit aa129b9539
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+9 -11
View File
@@ -1904,25 +1904,23 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
user.visible_message("<span class='danger'>[user.name] shoves [target.name]!</span>", user.visible_message("<span class='danger'>[user.name] shoves [target.name]!</span>",
"<span class='danger'>You shove [target.name]!</span>", null, COMBAT_MESSAGE_RANGE) "<span class='danger'>You shove [target.name]!</span>", null, COMBAT_MESSAGE_RANGE)
var/target_held_item = target.get_active_held_item() var/target_held_item = target.get_active_held_item()
var/knocked_item = FALSE
if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types)) if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
target_held_item = null target_held_item = null
if(!target.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) if(!target.has_movespeed_modifier(MOVESPEED_ID_SHOVE))
target.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH) target.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH)
if(target_held_item) if(target_held_item)
target.visible_message("<span class='danger'>[target.name]'s grip on \the [target_held_item] loosens!</span>", if(!HAS_TRAIT(target_held_item, TRAIT_NODROP))
"<span class='danger'>Your grip on \the [target_held_item] loosens!</span>", null, COMBAT_MESSAGE_RANGE) target.visible_message("<span class='danger'>[target.name]'s grip on \the [target_held_item] loosens!</span>",
"<span class='danger'>Your grip on \the [target_held_item] loosens!</span>", null, COMBAT_MESSAGE_RANGE)
append_message += ", loosening their grip on [target_held_item]"
else
append_message += ", but couldn't loose their grip on [target_held_item]"
addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH) addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
else if(target_held_item) else if(target_held_item)
target.dropItemToGround(target_held_item) if(target.dropItemToGround(target_held_item))
knocked_item = TRUE target.visible_message("<span class='danger'>[target.name] drops \the [target_held_item]!!</span>",
target.visible_message("<span class='danger'>[target.name] drops \the [target_held_item]!!</span>", "<span class='danger'>You drop \the [target_held_item]!!</span>", null, COMBAT_MESSAGE_RANGE)
"<span class='danger'>You drop \the [target_held_item]!!</span>", null, COMBAT_MESSAGE_RANGE)
if(target_held_item)
if(knocked_item)
append_message += ", causing them to drop [target_held_item]" append_message += ", causing them to drop [target_held_item]"
else
append_message += ", loosening their grip on [target_held_item]"
log_combat(user, target, "shoved", append_message) log_combat(user, target, "shoved", append_message)
/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE) /datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE)