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

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

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

..

_stubs.dm

…

basic.dm

…

disabled.dm

…

hoist.dm

…

ladder_assembly_vr.dm

…

movement_vr.dm

(SQ-Merge) Possible fix for drop-nomming (#3331)

2018-03-25 15:32:12 -04:00

movement.dm

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

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

open_space_controller.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

pipes.dm

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

structures.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

turf.dm

Port SSoverlays & Convert turfs to use it (#5004)

2018-03-05 19:43:23 -06:00

zshadow.dm

Merge pull request #5093 from Neerti/3/21/2018_typing_fix

2018-03-23 21:40:00 -05:00