Trilbyspaceclone 5c2bf70fe7 Update code/game/objects/items/shields.dm ...

Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com>

2020-03-01 00:48:45 -05:00

..

area

Merge remote-tracking branch 'citadel/master' into the-p-o-o-l

2020-01-25 19:36:06 -07:00

gamemodes

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

machinery

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

mecha

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

objects

Update code/game/objects/items/shields.dm

2020-03-01 00:48:45 -05:00

turfs

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-22 00:55:32 +01:00

alternate_appearance.dm

…

atoms_movable.dm

…

atoms.dm

Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"

2020-02-05 23:50:41 -07:00

communications.dm

…

data_huds.dm

…

say.dm

Makes it compile also custom emote fix.

2020-02-06 01:40:14 +01:00

shuttle_engines.dm

…

sound.dm

…

world.dm

Merge pull request #11022 from kevinz000/ssprofiler

2020-02-13 15:06:27 +01:00