Kraseo 70859170c7 basically i fucking hate map merge conflicts

2020-04-04 16:32:45 +02:00

..

area

make the new holodeck an option

2020-03-28 22:24:47 +00:00

gamemodes

Further dynamic tweaks: "you can instamerge this time" edition (#11715)

2020-04-03 14:23:08 +02:00

machinery

Merge pull request #11706 from Ghommie/Ghommie-cit660

2020-04-03 21:55:16 -07:00

mecha

Merge pull request #11652 from Ghommie/Ghommie-cit650

2020-03-28 16:00:48 -07:00

objects

basically i fucking hate map merge conflicts

2020-04-04 16:32:45 +02:00

turfs

Update turf.dm (#11679)

2020-03-29 17:09:26 +02:00

alternate_appearance.dm

…

atoms_movable.dm

functionality

2020-03-28 23:50:06 -07:00

atoms_movement.dm

…

atoms.dm

Merge pull request #11340 from Ghommie/Ghommie-cit605

2020-03-07 03:26:48 -07:00

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

sound.dm

Replaces EXCEPTION() with stack_trace() and CRASH()

2020-03-05 01:47:04 +01:00

world.dm

…