ZomgPonies
|
91e8b909c0
|
Squish Squash
|
2015-04-04 14:27:53 -04:00 |
|
Markolie
|
bd11c78235
|
Replace every instance of NanoTrasen with Nanotrasen.
|
2014-11-29 21:01:29 +01:00 |
|
Jeremy Liberman
|
a4196cb745
|
Add Vox Heist directive and call shuttle on completion of Directive X
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
|
2014-08-06 23:12:24 +02:00 |
|
PsiOmega
|
ea378b3bb5
|
Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives.
Conflicts:
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
|
2014-07-28 13:24:38 -04:00 |
|
Zuhayr
|
197fc0c36c
|
Cleans up some of the lore issues with Mutiny.
Conflicts:
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
|
2014-07-13 06:22:30 -04:00 |
|
ZomgPonies
|
cb9b6fca4d
|
Replacing civilian with support department. Still need to make changes on MySQL schema.
|
2014-06-26 19:42:14 -04:00 |
|
alex-gh
|
6b230d693f
|
Runtime fixes
|
2014-06-25 21:20:54 +02:00 |
|
Jeremy Liberman
|
b9f40d1b71
|
Rephrase text based on code review
|
2014-06-05 16:05:25 -04:00 |
|
Jeremy Liberman
|
33cd27e032
|
Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.
Conflicts:
code/__HELPERS/names.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
|
2014-06-05 16:05:09 -04:00 |
|
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 |
|
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 |
|
alex-gh
|
4dc1e5c0b3
|
Merged latest mutiny fixes.
|
2014-05-19 19:54:42 +02: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 |
|