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

This commit is contained in:
Fox-McCloud
2015-02-14 22:02:39 -05:00
158 changed files with 2423 additions and 1749 deletions
+1 -1
View File
@@ -144,7 +144,7 @@
var/obj/item/device/assembly_holder/H = W
if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
message_admins("[key_name_admin(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
msg_admin_attack("[key_name_admin(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
log_game("[key_name(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
rig = W