Artur 6c4e733a38 More testmerge fixes

2020-07-03 15:16:02 +03:00

..

_common

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

2020-06-30 02:30:29 +03:00

abductor

Conflicts!!!

2020-06-22 17:39:24 +03:00

blob

Conflicts!!!

2020-06-22 17:39:24 +03:00

blood_contract

More bug reports yee'd their last haw.

2020-03-18 23:43:23 +01:00

bloodsucker

Merge pull request #12622 from timothyteakettle/grammar-fixes

2020-06-29 21:13:06 +02:00

brainwashing

…

brother

Properly closes some bold tags. (#12088)

2020-05-02 14:53:17 +02:00

changeling

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

2020-06-30 02:30:29 +03:00

clockcult

More testmerge fixes

2020-07-03 15:16:02 +03:00

collector

…

cult

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

2020-06-23 00:13:14 +02:00

devil

Conflicts!!!

2020-06-22 17:39:24 +03:00

disease

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

ert

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

fugitive

update antag huds

2020-06-16 18:45:06 +01:00

greentext

…

greybois

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

highlander

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

magic_servant

…

monkey

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

morph

Porting "Personal interaction messages to simple animals" and more. (#12268)

2020-05-18 04:46:57 -07:00

nightmare

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

ninja

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

nukeop

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

official

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

overthrow

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

pirate

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

revenant

Conflicts!!!

2020-06-22 17:39:24 +03:00

revolution

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

santa

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

separatist

…

slaughter

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00

survivalist

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

swarmer

Porting "Personal interaction messages to simple animals" and more. (#12268)

2020-05-18 04:46:57 -07:00

traitor

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

2020-06-26 14:03:27 +03:00

valentines

…

wishgranter

A dynamic rework: target threat levels (#11515)

2020-03-25 17:40:37 +01:00

wizard

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

2020-07-02 23:23:47 +03:00

xeno

Ports https://github.com/tgstation/tgstation/pull/51585

2020-06-17 17:07:42 +03:00