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

..

effects

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

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

items

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

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

random

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04:00

structures

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

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

banners.dm

…

buckling.dm

Lazily implements taur riding

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

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

for(var/bad_code in world)

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

items.dm

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

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

mob_spawner_vr.dm

…

objs.dm

Recharger refactor

2018-06-16 17:15:59 -04:00

structures.dm

Removes my incompetence.

2018-05-08 18:41:47 -07:00

stumble_into_vr.dm

…

weapons.dm

Adds Tile-based Attacks

2018-04-05 13:28:05 -04:00