cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unnerf security's non-lethals, revert pain decay changes. (#11305)

Browse Source
This commit is contained in:
Matt Atlas
2021-03-02 20:40:03 +01:00
committed by GitHub
parent 0fc1fcf84f
commit d1a30fc4a0
20 changed files with 119 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+2 -2
View File
@@ -18,7 +18,7 @@
origin_tech = list(TECH_COMBAT = 2)
attack_verb = list("beaten")
var/stunforce = 0
var/agonyforce = 70
var/agonyforce = 60
var/status = 0 //whether the thing is on or not
var/obj/item/cell/bcell
var/hitcost = 1000
@@ -188,7 +188,7 @@
L.visible_message("<span class='danger'>[L] has been prodded with \the [src] by [user]!</span>")
//stun effects
L.stun_effect_act(stun, agony, used_weapon = src, damage_flags = DAM_DISPERSED)
L.stun_effect_act(stun, agony, target_zone, src)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)