cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
This commit is contained in:
mwerezak
2015-02-15 22:11:16 -05:00
parent 52754f0f85 c71cd925c4
commit 69284990a3
835 changed files with 15012 additions and 48713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/topic.dm
View File

@@ -1980,7 +1980,7 @@
if(!ticker)
alert("The game hasn't started yet!")
return
var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
var/objective = sanitize(copytext(input("Enter an objective"),1,MAX_MESSAGE_LEN))
if(!objective)
return
feedback_inc("admin_secrets_fun_used",1)