Novacat cfe200ffc9 Merge pull request #4665 from VOREStation/upstream-merge-5824 ...

[MIRROR] Fixes non-black/white paint buckets not actually having paint in them

2019-03-27 14:12:46 -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

…

gamemodes

Merge pull request #4655 from VOREStation/upstream-merge-5793

2019-03-27 13:52:08 -04:00

jobs

Fixes a runtime with radio.dm

2018-12-09 01:55:46 -05:00

machinery

Merge pull request #4661 from Heroman3003/fuck-is_multitool

2019-03-27 14:12:08 -04:00

magic

…

mecha

Conflict Resolution

2019-03-27 10:58:53 -04:00

objects

Merge pull request #4665 from VOREStation/upstream-merge-5824

2019-03-27 14:12:46 -04:00

turfs

Conflict Resolution

2019-03-27 12:19:15 -04:00

vehicles

…

verbs

Conflict Resolution

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

atoms_movable_vr.dm

…

atoms_movable.dm

Conflict Resolution

2019-03-27 12:19:15 -04:00

atoms.dm

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

2019-03-26 13:21:08 -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

…