cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolves merge conflicts

Browse Source 
Conflicts:
	code/game/machinery/computer/communications.dm
This commit is contained in:
Krausus
2015-08-18 04:14:14 -04:00
parent 6dc8b850ac e618f79418
commit f816b8672d
136 changed files with 942 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/timer.dm
+4
View File
@@ -110,6 +110,10 @@
if(href_list["time"])
timing = !timing
if(timing && istype(holder, /obj/item/device/transfer_valve))
message_admins("[key_name_admin(usr)] activated [src] attachment on [holder].")
bombers += "[key_name(usr)] activated [src] attachment for [loc]"
log_game("[key_name(usr)] activated [src] attachment for [loc]")
update_icon()
if(href_list["reset"])
time = set_time