Lin 91dc8b96d0 Merge pull request #12932 from silicons/ok_2 ...

perfect parries with an energy sword now reflect projectiles back at their shooter

2020-07-28 21:45:53 -05:00

..

area

Update areas.dm

2020-07-18 20:50:28 -07:00

gamemodes

Merge pull request #12920 from zeroisthebiggay/blackboxfatcox

2020-07-26 22:58:43 -07:00

machinery

Merge pull request #12930 from Citadel-Station-13/silicons-patch-60

2020-07-28 21:45:10 -05:00

mecha

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

objects

Merge pull request #12932 from silicons/ok_2

2020-07-28 21:45:53 -05:00

turfs

Update space.dm

2020-07-18 20:52:15 -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

Merge branch 'master' into wound-port

2020-07-18 21:45:24 +01:00

communications.dm

…

data_huds.dm

…

say.dm

fix

2020-07-09 03:17:17 -07:00

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