kevinz000 9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-16 13:47:53 -07:00

..

_common

part 4: the one where i slowly go insane

2020-03-01 22:05:35 +01:00

abductor

better

2020-03-16 04:59:55 -07:00

blob

Fixes jump to node

2020-03-11 17:39:08 -04:00

blood_contract

…

bloodsucker

i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461)

2020-03-15 04:03:50 +01:00

brainwashing

…

brother

…

changeling

k

2020-03-16 12:51:30 -07:00

clockcult

Merge pull request #11391 from Ghommie/Ghommie-cit612

2020-03-10 05:58:17 -07:00

collector

…

cult

bet

2020-03-16 11:15:11 -07:00

devil

Merge pull request #11332 from Ghommie/Ghommie-cit603

2020-03-06 00:14:13 -07:00

disease

…

ert

…

greentext

…

greybois

…

highlander

…

magic_servant

…

monkey

…

morph

…

nightmare

…

ninja

Stops ninjas employed by syndies from receiving friendly flavor objectives.

2020-03-04 00:36:18 +01:00

nukeop

Merge pull request #10702 from Ghommie/Ghommie-cit528

2020-03-10 17:24:48 -07:00

official

…

overthrow

WIP

2020-03-08 19:26:01 +01:00

pirate

…

revenant

Ports "Switches out the three billion args of electrocute act for flags"

2020-03-09 04:01:23 +01:00

revolution

…

santa

…

separatist

…

slaughter

WIP

2020-03-08 19:26:01 +01:00

survivalist

…

swarmer

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

2020-03-11 02:17:16 -07:00

traitor

Merge pull request #11290 from Putnam3145/traitor-types

2020-03-15 01:35:30 -07:00

valentines

…

wishgranter

…

wizard

More dynamic fixes (#11451)

2020-03-14 02:49:25 +01:00

xeno

…