keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport

2021-05-31 22:21:34 -04: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

The Mapping Update

2021-03-12 12:11:35 +08: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

abuse

2021-05-24 21:40:15 -04:00

clockcult

Skewer Pain

2021-05-08 19:35:55 -04:00

collector

…

cult

Activity tracking; traitor class tweaks

2021-04-13 06:42:32 -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

fixes linter warnings (#14778)

2021-05-31 10:19:20 -05: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

fixed disky comfort spam

2021-05-10 16:06:57 -03:00

official

…

overthrow

…

pirate

…

revenant

deterministic explosion system (#13392)

2021-05-12 05:44:53 -05:00

revolution

…

santa

…

separatist

…

slaughter

Update slaughter.dm

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

survivalist

…

swarmer

The Mapping Update

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

traitor

Activity tracking; traitor class tweaks

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

valentines

…

wishgranter

…

wizard

Fixes the linter

2021-05-27 13:25:27 -04:00

xeno

…