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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm
This commit is contained in:
skull132
2017-05-27 20:11:54 +03:00
parent 9b80bce9ab fd6a8305a5
commit 22c7748336
34 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+1 -1
View File
@@ -953,7 +953,7 @@
M << "You've been hit by bluespace artillery!"
log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]",admin_key=key_name(src.owner),ckey=key_name(M))
message_admins("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
message_admins("[key_name_admin(M)] has been hit by Bluespace Artillery fired by [src.owner]")
M.canmove = FALSE
spawn(20)