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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
Mark van Alphen
2019-04-11 07:27:51 +02:00
parent 11c5f441fd 97360c42b4
commit c597c9be51
34 changed files with 235 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -1
View File
@@ -18,7 +18,7 @@
do_sparks(rand(5, 9), FALSE, src)
playsound(flashbang_turf, 'sound/effects/bang.ogg', 25, 1)
bang(flashbang_turf, range, src)
bang(flashbang_turf, src, range)
for(var/obj/structure/blob/B in hear(8, flashbang_turf)) //Blob damage here
var/damage = round(30 / (get_dist(B, get_turf(src)) + 1))