cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'polaris/master' into polaris-sync

Browse Source 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
This commit is contained in:
Leshana
2017-04-15 23:14:32 -05:00
parent a6d1047f48 1fbef2de5b
commit 7a4dc4bf79
108 changed files with 3048 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/targeting/targeting_overlay.dm
+1
View File
@@ -163,6 +163,7 @@ obj/aiming_overlay/proc/update_aiming_deferred()
owner.visible_message("<span class='danger'>\The [owner] turns \the [thing] on \the [target]!</span>")
else
owner.visible_message("<span class='danger'>\The [owner] aims \the [thing] at \the [target]!</span>")
log_and_message_admins("aimed \a [thing] at [key_name(target)].")
if(owner.client)
owner.client.add_gun_icons()