Birdtalon 074ee967e5 Merge branch 'master' into ERT-changes

2018-10-07 19:22:10 +01:00

..

area

Merge pull request #7770 from SamHPurp/motherfucking-delta-station

2018-10-02 08:30:29 +08:00

dna

Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled

2018-09-27 21:47:04 +08:00

gamemodes

Merge pull request #9725 from SkeletalElite/Holopara

2018-10-07 16:33:36 +08:00

jobs

Resolved merge conflicts... I hope.

2018-10-06 16:01:34 +01:00

machinery

Merge branch 'master' into ERT-changes

2018-10-07 19:22:10 +01:00

magic

no more runtimes

2018-03-29 00:44:53 -04:00

mecha

Merge pull request #9372 from Kyep/pod_fix

2018-09-28 15:02:57 +08:00

objects

Merge branch 'master' into ERT-changes

2018-10-07 19:22:10 +01:00

turfs

Merge branch 'master' into ERT-changes

2018-10-07 19:22:10 +01:00

verbs

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

alternate_appearance.dm

…

asteroid.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

atoms_movable.dm

get area master does nothing!

2018-09-30 17:28:47 +01:00

atoms.dm

Merge pull request #9477 from variableundefined/SSPortShuttle

2018-10-01 01:13:42 -07:00

data_huds.dm

Abductor Update

2018-07-24 19:49:10 -04:00

shuttle_engines.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

sound.dm

Ports Looping Sounds

2018-04-26 19:18:24 -04:00

world.dm

Merge pull request #9477 from variableundefined/SSPortShuttle

2018-10-01 01:13:42 -07:00