Unknown efdb175d52 Conflict Resolution

2019-03-28 15:02:22 -04:00

..

antagonist

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

area

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

dna

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

gamemodes

Merge pull request #4720 from VOREStation/upstream-merge-5896

2019-03-28 14:35:51 -04:00

jobs

Merge pull request #5835 from Cerebulon/ReligionUpdate

2019-01-14 03:47:00 -05:00

machinery

Conflict Resolution

2019-03-28 15:02:22 -04:00

magic

…

mecha

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

objects

Merge pull request #4695 from VOREStation/upstream-merge-5856

2019-03-27 20:54:57 -04:00

turfs

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

vehicles

…

verbs

Conflict Resolution

2019-03-27 12:05:38 -04:00

atoms_movable_vr.dm

…

atoms_movable.dm

Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it

2019-03-27 14:49:30 -04:00

atoms.dm

Merge pull request #4684 from VOREStation/upstream-merge-5814

2019-03-27 17:46:31 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

Adds Various Sounds, Looping Sound System

2019-03-27 03:55:21 -04:00

supplyshuttle.dm

…

trader_visit.dm

…