Kelshark 5ee893eda1 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme

2017-09-03 12:49:08 -04:00

..

guns

Size changes.

2017-07-28 06:43:44 -04:00

custom_boxes_vr.dm

Map changes

2017-08-31 22:13:31 -04:00

custom_boxes_yw.dm

Now with fluff

2017-09-02 01:13:53 +02:00

custom_clothes_vr.dm

Teshari stuff was added to Polaris.

2017-08-28 21:22:05 -04:00

custom_clothes_yw.dm

Now with fluff

2017-09-02 01:13:53 +02:00

custom_guns_vr.dm

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

2017-08-18 08:14:12 -04:00

custom_items_vr.dm

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

2017-09-03 12:49:08 -04:00

custom_items_yw.dm

Fixes fluff being in the loudouts

2017-08-18 17:11:28 +02:00

custom_mecha_vr.dm

…

custom_mecha_yw.dm

fluff for Deathy and preparation for custom mech skins

2017-05-03 18:41:32 +02:00

custom_permits_vr.dm

Update custom_permits_vr.dm

2017-09-01 06:50:03 -04:00

MadokaSpear.dm

…

nazirus_yw.dm

Finished the armooooors

2017-09-01 16:40:16 +02:00