Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

alien

…

mutiny

Colony Director -> Site Manager

2020-08-27 20:43:04 -04:00

outsider

Fixing conflicts

2020-10-05 18:10:53 -07:00

station

Colony Director -> Site Manager

2020-08-27 20:43:04 -04:00

_antagonist_setup.dm

…

antagonist_add.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

antagonist_create.dm

Merge pull request #6840 from Neerti/qol_notification_sounds

2020-03-20 15:09:47 -04:00

antagonist_equip.dm

…

antagonist_factions.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

antagonist_helpers.dm

Fixes runtime in antagonist_helpers.dm, line 15: Cannot read null.mob_type (#7195)

2020-05-19 21:53:10 -04:00

antagonist_objectives.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

antagonist_panel.dm

…

antagonist_place.dm

…

antagonist_print.dm

i think this is all the changes ?

2020-07-27 20:59:20 -03:00

antagonist_update.dm

TGUI Appearance Editor (Mirrors & Admin)

2020-08-10 08:08:33 -07:00

antagonist.dm

Refactor job joins for noncarbons

2020-05-07 19:48:25 -04:00