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

[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work

Browse Source
This commit is contained in:
Neerti
2019-01-26 04:25:17 -05:00
committed by Novacat
parent 1b2116bf80
commit 3256202407
86 changed files with 4372 additions and 1777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/machinery/embedded_controller/embedded_program_base.dm
View File

@@ -17,9 +17,12 @@
/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param)
return
/datum/computer/file/embedded_program/process()
<<<<<<< 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)