Jeremy Liberman
|
b3d3f5df8c
|
Mutiny fix prereqs for directives
Conflicts:
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
code/game/gamemodes/mutiny/directives/terminations_directive.dm
code/game/gamemodes/mutiny/directives/test_directive.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
|
2014-05-25 22:34:39 +02:00 |
|
ZomgPonies
|
eed61ed46c
|
Remove debug line
|
2014-05-24 16:51:50 -04:00 |
|
mwerezak
|
62daf11857
|
Possible fix for mutiny modes not being selected
Not entirely sure, I've had trouble with the in operator precedence with
for-loops in the past. I can't test without seven people though.
|
2014-05-24 22:08:46 +02:00 |
|
mwerezak
|
448d3697b6
|
Fixes bluespace contagion directive selecting...
ghosts and new players as infected.
|
2014-05-24 22:08:27 +02:00 |
|
alex-gh
|
d14d253414
|
Mutiny fixes? 3
Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
|
2014-05-21 16:30:49 +02:00 |
|
ZomgPonies
|
9e89c8cdcb
|
Mutiny fixes
Conflicts:
code/game/gamemodes/mutiny/mutiny.dm
code/game/objects/items.dm
|
2014-05-20 13:06:59 +02:00 |
|
alex-gh
|
5066000778
|
Replayed mutiny fixes
|
2014-05-20 13:01:15 +02:00 |
|
alex-gh
|
4dc1e5c0b3
|
Merged latest mutiny fixes.
|
2014-05-19 19:54:42 +02:00 |
|
ZomgPonies
|
a2b05d96f5
|
Mutiny fixes
|
2014-05-15 03:16:48 -04:00 |
|
ZomgPonies
|
8aa4d10b75
|
Trying to fix mutiny mode?
|
2014-05-15 01:52:27 -04:00 |
|
Jeremy Liberman
|
bd249e3a53
|
Mutiny Mode
Conflicts:
code/__HELPERS/time.dm
code/controllers/hooks-defs.dm
code/controllers/hooks.dm
code/game/machinery/computer/card.dm
code/game/machinery/podmen.dm
code/modules/admin/player_panel.dm
code/modules/client/preferences.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/login.dm
code/modules/mob/mob.dm
code/modules/security levels/keycard authentication.dm
code/setup.dm
icons/mob/mob.dmi
|
2014-05-15 01:01:54 -04:00 |
|