Skip to content

Commit

Permalink
Merge pull request tgstation#10342 from MrStonedOne/revert-9745-super…
Browse files Browse the repository at this point in the history
…_bummer_man_64

[quick merge] Revert "Fixes overexcited TTV reporting"
  • Loading branch information
Razharas committed Jul 3, 2015
2 parents 0919cc0 + ed92386 commit 07377be
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/game/objects/items/devices/transfer_valve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,10 @@

var/bomb_message = "[log_str1] <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name]</a> [log_str2][log_attacher] [log_str3][last_touch_info]"

if(tank_one.volume != tank_two.volume) //Equivilent volume prior to mixing means the bomb has probably been fouled by a valve opening already
bombers += bomb_message
bombers += bomb_message

message_admins(bomb_message, 0, 1)
log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]")
message_admins(bomb_message, 0, 1)
log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]")
merge_gases()
spawn(20) // In case one tank bursts
for (var/i=0,i<5,i++)
Expand Down

0 comments on commit 07377be

Please sign in to comment.