MMMiracles c5447934aa conflicts

2020-01-05 09:32:12 -05:00

..

area

[READY] Moves Genetics to the Science department and makes Gen… (#48397)

2020-01-02 06:15:35 -08:00

gamemodes

Fixes dynamic rev ruleset going bonkers when first assigned is invalid. (#48457)

2019-12-30 22:50:24 +01:00

machinery

Adds beacons to Meta

2020-01-05 16:43:47 +13:00

mecha

Removes some dead/unused code (#48158)

2019-12-15 14:09:02 -05:00

objects

conflicts

2020-01-05 09:32:12 -05:00

turfs

Luxury shuttle improvements (#48395)

2019-12-28 05:09:30 +01:00

alternate_appearance.dm

Cleanup

2019-10-25 04:26:09 -03:00

atoms_movable.dm

Revert "[ready] Smooth-ish move rising: revengeance" (#48156)

2020-01-04 23:58:31 +13:00

atoms.dm

Moves shuttle related logs into a new log file (#48441)

2019-12-30 15:56:05 -05:00

communications.dm

Replaces radio channel names and keys with defines

2018-11-16 09:36:49 -05:00

data_huds.dm

Removes unreachable code (#48143)

2019-12-10 20:52:13 +13:00

say.dm

Refactors language holder (#48106)

2019-12-18 22:22:12 +01:00

shuttle_engines.dm

New 'hear' span class (#46369)

2019-09-14 23:56:34 -07:00

sound.dm

Removes unreachable code (#48143)

2019-12-10 20:52:13 +13:00

world.dm

Moves shuttle related logs into a new log file (#48441)

2019-12-30 15:56:05 -05:00