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

# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-29 09:58:53 -04:00

..

preferences_vr.dm

Fixup wings and custom vorestation tails to the new update_icons() system.

2018-03-16 00:46:10 -04:00

spider_taur_powers_vr.dm

…

sprite_accessories_taur_vr.dm

Removed riding tentacles/Unique text for Alraune

2018-05-15 12:11:15 +10:00

sprite_accessories_taur_yw.dm

Readded fatty taurs,

2018-06-06 19:52:48 -04:00

sprite_accessories_vr.dm

Adds a bunch of new sprite accessories.

2018-06-29 15:32:30 +03:00

sprite_accessories_yw.dm

Lots of new markings and stuff

2018-06-08 21:24:32 -04:00

update_icons_vr.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00