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-02-21 13:35:26 -07:00
parent c7273c03be 869fb5e897
commit a784a74ccb
180 changed files with 4392 additions and 2132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -528,7 +528,7 @@
if(B.cell)
if(B.cell.charge > 0 && B.status == 1)
flick("baton_active", src)
var/stunforce = B.stunforce
var/stunforce = B.stamforce
user.DefaultCombatKnockdown(stunforce)
user.stuttering = stunforce/20
B.deductcharge(B.hitcost)