Repede 9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map ...

# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme

2019-11-29 19:13:53 -05:00

..

preference_setup

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map

2019-11-29 19:13:53 -05:00

client defines.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

client procs.dm

Testfix/reset filediff

2019-11-13 05:00:38 -07:00

movement.dm

…

preferences_factions.dm

Merge pull request #5835 from Cerebulon/ReligionUpdate

2019-01-14 03:47:00 -05:00

preferences_savefile.dm

Copy character slots

2019-03-08 20:17:46 -05:00

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

Testfix/reset filediff

2019-11-13 05:00:38 -07:00

preferences_vr.dm

Stage only files without broken filediff

2019-10-28 15:39:32 -06:00

preferences.dm

Update preferences.dm

2019-03-28 21:34:11 -04:00

spam_prevention.dm

…

ui_style.dm

Ports character setup subsystem

2019-05-14 11:48:34 +10:00