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
Files
dbca9f61fc63b2d54ca8e19df6d9c35f28a059a0
CHOMPStation2/code/modules/client
History
PsiOmegaDelta 34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
2015-07-14 08:21:12 +02:00
..
client defines.dm
Staff now have a "re-admin self" button after de-admining themselves.
2015-03-05 11:05:58 -05:00
client procs.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
preferences_factions.dm
A bit of prep work for integegrating player-set backgrounds into gameplay.
2014-08-01 22:54:57 +09:30
preferences_gear.dm
Adds engineering workboots
2015-05-23 23:00:26 -04:00
preferences_savefile.dm
Merge with dev.
2015-03-30 08:36:52 +10:30
preferences_spawnpoints.dm
Adds cyborg-only latejoin spawnpoint
2014-11-14 23:38:09 +00:00
preferences_toggles.dm
Mob refactoring.
2015-03-29 10:44:31 +02:00
preferences.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-14 08:21:12 +02:00