Timothy Teakettle eba1e8f301 fixes the merge conflicts

2020-06-15 23:29:49 +01:00

..

_common

Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)

2020-05-20 18:42:58 -07:00

abductor

Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)

2020-05-20 18:42:58 -07:00

blob

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

blood_contract

More bug reports yee'd their last haw.

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

bloodsucker

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

brainwashing

…

brother

Properly closes some bold tags. (#12088)

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

changeling

Merge pull request #11627 from kevinz000/combat_rework

2020-06-12 16:39:11 -05:00

clockcult

Merge pull request #11627 from kevinz000/combat_rework

2020-06-12 16:39:11 -05:00

collector

…

cult

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

2020-06-02 21:49:43 -07:00

devil

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

2020-06-02 21:49:43 -07:00

disease

Runechat Port (#12065)

2020-05-03 03:53:19 +02:00

ert

Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)

2020-05-20 18:42:58 -07: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

A dynamic rework: target threat levels (#11515)

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

morph

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

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

nightmare

A dynamic rework: target threat levels (#11515)

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

ninja

More dynamic rework: help I wasn't done (#11642)

2020-03-28 14:46:37 +01:00

nukeop

Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)

2020-05-20 18:42:58 -07:00

official

…

overthrow

A dynamic rework: target threat levels (#11515)

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

pirate

A dynamic rework: target threat levels (#11515)

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

revenant

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

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

revolution

A dynamic rework: target threat levels (#11515)

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

santa

Spellcasting element

2020-03-11 16:23:30 +01:00

separatist

…

slaughter

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

2020-05-18 04:46:57 -07: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

Update code/modules/antagonists/traitor/classes/martyr.dm

2020-06-08 21:16:32 -07:00

valentines

…

wishgranter

A dynamic rework: target threat levels (#11515)

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

wizard

Porting tesla/electrocute code updates. (#12280)

2020-05-17 16:35:17 -07:00

xeno

A dynamic rework: target threat levels (#11515)

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