cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source 
This one made a lynx cry.
This commit is contained in:
Unknown
2019-03-28 13:19:19 -04:00
parent 3256202407
commit cf39c61c2d
27 changed files with 96 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/embedded_controller/embedded_program_base.dm
-6
View File
@@ -17,12 +17,6 @@
/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param)
return
<<<<<<< HEAD
/datum/computer/file/embedded_program/proc/process()
return
=======
>>>>>>> 9ff8103... Merge pull request #5636 from kevinz000/pixel_projectiles
/datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line)
if(master)
master.post_signal(signal, comm_line)