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

..

antagonist

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

area

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

2018-06-02 18:33:44 -04:00

dna

Removes old taur riding code

2018-04-21 11:01:44 -04:00

gamemodes

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

2018-06-23 17:53:13 -04:00

jobs

Blueshield tweaks and map_template.dm typo fix

2018-06-28 00:23:41 -04:00

machinery

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

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

magic

…

mecha

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

2018-06-02 18:33:44 -04:00

objects

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

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

turfs

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

2018-06-23 17:53:13 -04:00

vehicles

…

verbs

…

atoms_movable_vr.dm

Lazily implements taur riding

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

atoms_movable.dm

Lazily implements taur riding

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

atoms.dm

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trader_visit.dm

…

world.dm

…