Artur dabdf16eac Coonflict fiiixeeess

2020-05-13 12:56:17 +03:00

..

area

Ports TG Icemoon framework and map (#49680) (#12002)

2020-05-07 14:46:16 +02:00

gamemodes

Config for antag forcing (#12171)

2020-05-10 21:35:20 +02:00

machinery

Coonflict fiiixeeess

2020-05-13 12:56:17 +03:00

mecha

Merge conflict fix

2020-05-13 12:37:18 +03:00

objects

Coonflict fiiixeeess

2020-05-13 12:56:17 +03:00

turfs

fixes the second level not spawning any rocks (and therefore no glass) while I have a PR open

2020-05-09 17:51:45 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Porting "Refactors language holder"

2020-05-08 22:44:02 +02:00

atoms_movement.dm

Merge branch 'master' into Ghommie-cit721

2020-05-07 18:18:54 +02:00

atoms.dm

Coonflict fiiixeeess

2020-05-13 12:56:17 +03:00

communications.dm

…

data_huds.dm

fix everything

2020-04-11 15:32:09 +08:00

say.dm

Porting "Refactors language holder"

2020-05-08 22:44:02 +02:00

shuttle_engines.dm

…

sound.dm

…

world.dm

Merge conflict fix

2020-05-13 12:37:18 +03:00