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

# Conflicts:
#	code/modules/multiz/pipes.dm
#	config/custom_items.txt

2018-03-14 18:23:53 -04:00

..

antagonist

Port Bay's survival boxes

2018-02-16 19:21:15 -06:00

area

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

2018-03-09 23:17:44 -05:00

dna

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

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

gamemodes

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

2018-03-10 21:49:15 -05:00

jobs

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

2018-02-24 22:51:59 -05:00

machinery

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

2018-03-14 18:23:53 -04:00

magic

…

mecha

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

2018-03-06 18:11:39 -05:00

objects

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

2018-03-14 18:23:53 -04:00

turfs

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

2018-03-09 23:17:44 -05:00

vehicles

…

verbs

POLARIS: Revamp logging to be consistent

2018-03-10 17:18:09 -05:00

atoms_movable.dm

POLARIS: Use drop_location() for things

2018-03-08 13:03:09 -05:00

atoms.dm

POLARIS: Rename make_nametag_name/desc

2018-03-12 20:25:36 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

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

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

skincmd.dm

…

socket_talk.dm

…

sound.dm

POLARIS: Port's /tg/'s current sound.dm, plus pref

2018-02-27 13:29:39 -05:00

supplyshuttle.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-03-03 13:09:57 -05:00

trader_visit.dm

…

world.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05:00