cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	code/modules/admin/topic.dm
This commit is contained in:
Zuhayr
2015-08-22 02:30:14 +09:30
parent 3bfa541612 bf313ae238
commit edf74e4721
102 changed files with 1220 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/spray.dm
+2
View File
@@ -40,6 +40,8 @@
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.setClickCooldown(4)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")