silicons 8dedcbcf76 Merge branch '13113'

2020-08-16 18:53:35 -07:00

..

area

regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)

2020-08-09 15:57:53 +02:00

gamemodes

descriptions, conflict, and actually puts requirements for the gamemode.

2020-08-10 20:59:51 -07:00

machinery

Merge branch '13113'

2020-08-16 18:53:35 -07:00

mecha

heretics from tg (with changes)

2020-08-10 19:17:26 -07:00

objects

Merge branch '13113'

2020-08-16 18:53:35 -07:00

turfs

Merge branch '13113'

2020-08-16 18:53:35 -07:00

alternate_appearance.dm

…

atoms_movable.dm

https://github.com/tgstation/tgstation/pull/52255

2020-07-16 20:05:37 +08:00

atoms_movement.dm

sigh

2020-07-20 21:37:44 -07:00

atoms.dm

heretics from tg (with changes)

2020-08-10 19:17:26 -07:00

communications.dm

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

sound.dm

…

world.dm

Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-13 16:20:54 +03:00