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 branch 'dev' into ofSleepersAndNano

Browse Source 
Conflicts:
	code/game/machinery/Sleeper.dm
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-08-13 09:20:51 +03:00
parent 9eacd42de8 ac80136603
commit d8d94b9d64
259 changed files with 3708 additions and 2372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/nano/interaction/default.dm
View File

@@ -15,7 +15,7 @@
return STATUS_UPDATE // Ghosts can view updates
/mob/living/silicon/pai/default_can_use_topic(var/src_object)
if(src_object == src && !stat)
if((src_object == src || src_object == radio) && !stat)
return STATUS_INTERACTIVE
else
return ..()