cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworks Flashbangs (#18189)

Browse Source 
* Reworks Flashbangs

Flashbangs no longer weaken, instead causing those affected to crawl and additionally makes them confused.

* Hippie Repellent

Reworks Flashbangs. Converts weaken to crawling. Adds confusion.

* Riot Control

Fixes a typo.

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
Marm
2022-07-07 22:18:51 +01:00
committed by GitHub
co-authored by Charlie
parent 23ec577586
commit 5891c2b644
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/flashbang.dm
+4 -4
View File
@@ -47,20 +47,20 @@
M.show_message("<span class='warning'>BANG</span>", 2)
var/distance = max(1, get_dist(source_turf, get_turf(M)))
var/stun_amount = max(20 SECONDS / distance, 6 SECONDS)
var/status_duration = max(10 SECONDS / distance, 4 SECONDS)
// Flash
if(flash)
if(M.flash_eyes(affect_silicon = TRUE))
M.Weaken(stun_amount)
M.Confused(status_duration * 2)
// Bang
var/ear_safety = M.check_ear_prot()
if(bang)
if(!distance || A.loc == M || A.loc == M.loc) // Holding on person or being exactly where lies is significantly more dangerous and voids protection
M.Weaken(20 SECONDS)
M.KnockDown(10 SECONDS)
if(!ear_safety)
M.Weaken(stun_amount)
M.KnockDown(status_duration)
M.AdjustEarDamage(5, 15)
if(iscarbon(M))
var/mob/living/carbon/C = M