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

Merge branch 'master' into pumpkin_head

Browse Source
This commit is contained in:
alsoandanswer
2019-11-14 04:17:59 +08:00
committed by GitHub
parent 17da42d377 1b53c83cfd
commit 235de471b8
12 changed files with 92 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/trash.dm
+3
View File
@@ -55,6 +55,9 @@
name = "plate"
icon_state = "plate"
/obj/item/trash/plate/steak
icon_state = "steak"
/obj/item/trash/snack_bowl
name = "snack bowl"
icon_state = "snack_bowl"
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -1
View File
@@ -32,7 +32,7 @@
S.icon_state = "shield0"
to_chat(M, "<span class='danger'>BANG</span>")
playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 5, 0.9, 1)
playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 3, 0.5, 1)
//Checking for protections
var/eye_safety = 0