cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b6c28824b02a5310c73edab4fa81337abb5ebe4f
CHOMPStation2/code/controllers
History
Repede 372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
2018-04-27 21:45:13 -04:00
..
observer_listener/atom
Ports event system from Bay
2016-06-01 22:05:04 +01:00
Processes
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
ProcessScheduler
Ports https://github.com/tgstation/tgstation/pull/30184
2017-12-27 19:10:15 -05:00
subsystems
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
autotransfer.dm
Fixing votes
2018-03-16 17:46:22 -04:00
communications.dm
SC Stupid Sized Map Update
2017-12-24 07:04:34 -08:00
configuration_vr.dm
Adds cap on PTO
2018-02-02 18:37:50 -05:00
configuration_yw.dm
Interserver shipping update and other changes
2017-03-03 19:13:06 -05:00
configuration.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
controller.dm
Ports /tg's StonedMC Subsystem from Baystation12
2017-05-30 21:00:37 -04:00
emergency_shuttle_controller.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
failsafe.dm
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
2017-06-10 22:41:51 -04:00
globals.dm
Implemented basic GLOB and TGS3's DMAPI
2018-02-27 18:31:13 -05:00
hooks-defs.dm
Adds Supply Shuttle Hook
2017-03-06 12:36:19 -05:00
hooks.dm
Fixes issues travis found
2016-03-11 11:59:51 +03:00
master_controller.dm
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
master.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-04-27 21:45:13 -04:00
subsystem.dm
Merge pull request #5200 from VOREStation/vplk-stonedmc-sync
2018-04-24 15:20:57 -05:00
verbs.dm
Polaris sync
2017-09-15 21:17:34 -04:00
voting.dm
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-06-18 15:35:35 -04:00