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

# Conflicts:
#	code/hub.dm
#	code/modules/clothing/spacesuits/rig/suits/station_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	vorestation.dme

2016-08-21 16:05:27 -04:00

..

custom_boxes_vr.dm

xcom fluff 1

2016-07-01 05:07:00 -07:00

custom_clothes_vr.dm

Fixes path for fluff hoscoats.

2016-08-21 13:15:15 +01:00

custom_clothes_yw.dm

Fixed mask sprites breaking and fixed spear back icon.

2016-08-12 22:53:09 -04:00

custom_guns_vr.dm

The case of the backwards helmet.

2016-06-29 23:42:17 -07:00

custom_items_vr.dm

xcom fluff 1

2016-07-01 05:07:00 -07:00

custom_items_yw.dm

tiny spear fix

2016-08-20 13:23:04 -04:00

custom_permits_vr.dm

Gun fixes.

2016-06-08 20:01:20 -04:00

MadokaSpear.dm

Fixed Madoka spear completely

2016-08-19 21:22:47 -04:00