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
Files
ea76feb3cd9cddf930318914a87f66270254af0b
CHOMPStation2/code/controllers
History
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
..
Processes
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-11 18:47:05 +01:00
ProcessScheduler
Adds Destroys.
2015-04-24 17:11:14 +02:00
subsystem
Alarm subsystem is now processed by the scheduler. Removes now dead code.
2015-03-13 10:36:47 +01:00
autotransfer.dm
Updates the atom_pool, now datum_pool, to handle any datum object.
2015-04-24 09:59:05 +02:00
communications.dm
Fixed a list being qdel'd when radio is deleted.
2015-06-25 23:04:04 +03:00
configuration.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-27 10:20:20 +02:00
emergency_shuttle_controller.dm
Updates the atom_pool, now datum_pool, to handle any datum object.
2015-04-24 09:59:05 +02:00
failsafe.dm
new object-based lighting system
2015-05-10 20:54:25 +01:00
hooks-defs.dm
Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
2014-09-29 06:19:26 +09:30
hooks.dm
Mutiny Mode
2014-05-11 15:03:50 -05:00
master_controller.dm
Adds missing closing quote.
2015-08-10 18:10:53 +02:00
shuttle_controller.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-17 23:19:34 +02:00
subsystems.dm
Basic main structure for centralized alarm handling.
2015-02-17 08:34:26 +01:00
verbs.dm
Refactored random map generator system and added several terrain generators.
2015-06-03 04:36:19 +09:30
voting.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-27 10:20:20 +02:00