cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/door_control.dm
This commit is contained in:
Tigercat2000
2016-04-05 21:10:36 -07:00
parent bb5e3bca63 702ac3d367
commit dd79aaa967
21 changed files with 1125 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/communications.dm
+1
View File
@@ -202,6 +202,7 @@ var/const/RADIO_CLEANBOT = "10"
var/const/RADIO_FLOORBOT = "11"
var/const/RADIO_MEDBOT = "12"
var/const/RADIO_MAGNETS = "radio_magnet"
var/const/RADIO_LOGIC = "radio_logic"
var/global/datum/controller/radio/radio_controller