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

s

Browse Source
This commit is contained in:
kevinz000
2020-02-03 13:38:18 -07:00
parent 8556bcf2b3
commit e1ed34dcde
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/twohanded.dm
+5 -8
View File
@@ -1143,7 +1143,7 @@
if(cell) if(cell)
to_chat(user, "<span class='warning'>[src] already has a cell!</span>") to_chat(user, "<span class='warning'>[src] already has a cell!</span>")
else else
if(C.maxcharge < hitcost) if(C.maxcharge < min_hit_cost())
to_chat(user, "<span class='notice'>[src] requires a higher capacity cell.</span>") to_chat(user, "<span class='notice'>[src] requires a higher capacity cell.</span>")
return return
if(!user.transferItemToLoc(W, src)) if(!user.transferItemToLoc(W, src))
@@ -1182,12 +1182,9 @@
if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
return //CIT CHANGE - ditto return //CIT CHANGE - ditto
if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
if(on) clowning_around(user) //ouch!
clowning_around(user) //ouch! return
return
else
return ..(user, user) //beat yourself
if(iscyborg(target)) if(iscyborg(target))
..() ..()
return return
@@ -1263,7 +1260,7 @@
user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \ user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>") "<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
lethal_act(user, user, TRUE) harm_act(user, user, TRUE)
stun_act(user, user, TRUE) stun_act(user, user, TRUE)
deductcharge(lethal_cost) deductcharge(lethal_cost)