cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

Browse Source 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-08 14:22:44 +10:00
parent d02a411e2f 8432491e46
commit f7fcfa2a6f
49 changed files with 9346 additions and 9270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/assembly/signaler.dm
View File

@@ -101,6 +101,8 @@
signal()
if(!radio_connection) return
var/datum/signal/signal = new
signal.source = src
signal.encryption = code