cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c13f73848cf4f1f4aed0140f206eb0e169fbbf34
CHOMPStation2/code/modules/client/preference_setup
History
Repede c13f73848c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	vorestation.dme
2018-02-28 22:06:46 -05:00
..
antagonism
…
general
Preview background fixes and additions.
2018-02-20 09:52:56 +02:00
global
VS: Rewrites basically all of how bellies work
2018-02-27 13:29:45 -05:00
loadout
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-28 22:06:46 -05:00
occupation
POLARIS: No string compare for assistants
2018-01-30 21:44:00 -05:00
skills
…
traits
Polaris sync
2017-12-21 04:01:07 -05:00
vore
Fixes a couple of charsetup sanitizes
2018-01-05 12:28:15 -05:00
_defines.dm
…
preference_setup.dm
…