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

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
This commit is contained in:
PsiOmega
2015-05-05 08:11:28 +02:00
parent 8294f02c1b 864d40d1c4
commit 151c5204ee
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -157,7 +157,7 @@
if(world.time < next_fire_time)
if (world.time % 3) //to prevent spam
user << "<span class='warning'>[src] is not ready to fire again!"
user << "<span class='warning'>[src] is not ready to fire again!</span>"
return
//unpack firemode data