Ling c7e73e10be Fix merge conflicts

2018-10-11 17:46:18 +02:00

..

_common

Merge pull request #40365 from AnturK/team-panel

2018-09-27 22:26:41 +01:00

abductor

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

blob

Ghosts can now see the AI's camera (#40689)

2018-10-06 11:41:11 +01:00

blood_contract

Shows antag names for the few item created antagonists. (#40587)

2018-10-01 01:55:47 +01:00

brainwashing

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

brother

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

changeling

Fix merge conflicts

2018-10-11 17:46:18 +02:00

clockcult

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

cult

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

devil

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

disease

Ghosts can now see the AI's camera (#40689)

2018-10-06 11:41:11 +01:00

ert

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

greentext

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

highlander

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

hivemind

[s] Assimilation oversights (#40519)

2018-10-01 11:27:06 +02:00

magic_servant

Shows antag names for the few item created antagonists. (#40587)

2018-10-01 01:55:47 +01:00

monkey

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

morph

…

nightmare

…

ninja

Fix modularity machine

2018-10-01 10:31:57 +02:00

nukeop

Replaces istypes with the proper tool_behaviour checks. (#40414)

2018-10-01 01:10:45 +01:00

official

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

overthrow

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

pirate

Merge pull request #2621 from yogstation13/upstream-merge-40220

2018-09-26 18:54:06 +02:00

revenant

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

revolution

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

santa

Shows antag names for the few item created antagonists. (#40587)

2018-10-01 01:55:47 +01:00

separatist

…

slaughter

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

survivalist

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

swarmer

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

traitor

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

valentines

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

wishgranter

Objective refactor (#40220)

2018-09-20 16:18:57 +01:00

wizard

Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)

2018-10-10 23:21:27 +01:00

xeno

…