Lin 0bfb671f4e Merge pull request #14482 from silicons/combat_v7 ...

Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.

2021-06-27 13:04:29 -07:00

..

_common

Merge pull request #14716 from Putnam3145/fix-blacklisting-traits

2021-05-22 03:41:57 -06:00

abductor

Activity tracking; traitor class tweaks

2021-04-13 06:42:32 -07:00

blob

Merge remote-tracking branch 'citadel/master' into auxtools-atmos

2021-04-27 00:59:45 -07:00

blood_contract

…

bloodsucker

Adds a supernova event, with tweaks to allow this

2021-02-24 02:56:14 -08:00

brainwashing

…

brother

uh second try

2021-02-12 18:25:03 +01:00

changeling

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

2021-06-27 10:44:51 -07:00

clockcult

Merge pull request #14482 from silicons/combat_v7

2021-06-27 13:04:29 -07:00

collector

…

cult

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

2021-06-11 16:28:12 -07:00

devil

it compiles, UNTESTED YET

2021-02-13 21:41:59 +08:00

disease

Unlocks Sentient disease abilities

2021-02-23 16:25:18 -05:00

eldritch_cult

Merge pull request #14712 from keronshb/hereticadjustments

2021-06-09 11:12:23 -07:00

ert

…

fugitive

…

greentext

…

greybois

…

highlander

…

magic_servant

…

monkey

…

morph

Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor

2021-01-24 19:21:24 -05:00

nightmare

…

ninja

…

nukeop

theeighteenthofmany

2021-06-11 19:49:43 -04:00

official

…

overthrow

…

pirate

…

revenant

last bit of finetuning

2021-06-08 01:17:10 -04:00

revolution

…

santa

…

separatist

…

slaughter

Update slaughter.dm

2021-05-28 05:51:21 -07:00

space_dragon

Alt Click and Alt Click message

2021-05-19 20:01:11 -04:00

survivalist

…

swarmer

The Mapping Update

2021-03-12 12:11:35 +08:00

traitor

theseventeenthofmany

2021-06-11 19:48:04 -04:00

valentines

…

wishgranter

…

wizard

Merge pull request #14760 from keronshb/floorcluwneport

2021-06-09 11:21:22 -07:00

xeno

Also made alien threat WAY higher.

2020-12-14 18:38:11 -08:00