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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -05:00

..

effects

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

2018-02-02 19:25:51 -05:00

items

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

2018-02-02 19:25:51 -05:00

random

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

2018-02-01 23:55:47 -05:00

structures

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

2018-02-02 19:25:51 -05:00

banners.dm

Surface Map Work (#4557)

2018-01-17 13:46:19 -06:00

buckling.dm

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

items.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

mob_spawner_vr.dm

Trims back wilderness code that was dependent on tether map.

2018-01-17 15:23:22 -05:00

objs.dm

…

structures.dm

…

stumble_into_vr.dm

Can't open blast doors with your face

2017-11-12 16:40:41 -05:00

weapons.dm

Adds Visual Cleavage

2017-12-31 05:53:39 -05:00