Novacat 207775b2a7 Merge pull request #5119 from VOREStation/upstream-merge-6124 ...

[MIRROR] Fixes message on window frame fastening

2019-04-22 01:27:19 -04:00

..

antagonist

Merges AI Branch into Master

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

area

Arrivals Power Fix

2019-04-13 17:34:31 -04:00

dna

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

gamemodes

Adds New Alert Levels (#6019)

2019-03-30 18:29:12 -04:00

jobs

Merge pull request #5835 from Cerebulon/ReligionUpdate

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

machinery

Merge pull request #6125 from Heroman3003/fire-alarm-deconstruction

2019-04-22 00:29:16 -04:00

magic

…

mecha

Conflict Resolution

2019-04-18 02:00:59 -04:00

objects

Merge pull request #6124 from Heroman3003/window-message-fix

2019-04-22 00:29:26 -04:00

turfs

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

vehicles

…

verbs

Allows cyborgs and AIs to appear in character directory

2019-04-12 10:55:53 +10:00

atoms_movable_vr.dm

…

atoms_movable.dm

Conflict Resolution

2019-03-28 20:21:29 -04:00

atoms.dm

[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work

2019-03-27 22:02:07 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

Adds New Alert Levels (#6019)

2019-03-30 18:29:12 -04:00

shuttle_engines.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -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

Removes empty file, gives the QM a control console again (Was replaced with an ordering console)

2018-08-02 20:00:23 -07:00

trader_visit.dm

…

world.dm

Conflict Resolution

2019-03-28 13:19:19 -04:00