cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wounds-part-2

Browse Source
This commit is contained in:
Timothy Teakettle
2020-08-02 18:11:07 +01:00
parent 03d01d917f a7ba1f0cb7
commit 289c186f32
84 changed files with 5111 additions and 4076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/_onclick/item_attack.dm
View File

@@ -67,9 +67,9 @@
/**
* Called when someone uses us to attack a mob in melee combat.
*
*
* This proc respects CheckAttackCooldown() default clickdelay handling.
*
*
* @params
* * mob/living/M - target
* * mob/living/user - attacker
@@ -201,9 +201,9 @@
if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
. *= 0.5
. *= 0.8
else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
. *= 1.5
. *= 1.2
if(!user.mind || !I.used_skills)
return
@@ -220,7 +220,7 @@
* Also called when clicking on something with an item without being in melee range
*
* WARNING: This does not automatically check clickdelay if not in a melee attack! Be sure to account for this!
*
*
* @params
* * target - The thing we clicked
* * user - mob of person clicking