9473b7567e
Fixes antags spawning in space.
2015-11-19 04:49:35 -05:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
b1fe5e3eab
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
e81f42840a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
20eb505c69
Adds antag datum flag that is used to exlude the type from random selection.
...
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes #11416 .
2015-11-05 08:48:05 +01:00
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
0c474bc5a5
Merge pull request #11281 from mwerezak/autoantag
...
Cleans up antag auto-spawning, adds checks for active antags
2015-10-15 19:16:13 +03:00
ffb26a6f87
Adds checks for antags being dead or SSD
2015-10-14 14:57:52 -04:00
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
f0244bc9e5
Antag spawner now uses the starting location list...
...
..instead of the mob. Someone (might just maybe potentially be me, who knows) cleaned up the code a bit too quickly. Fixes #11284 .
2015-10-13 08:09:12 +02:00
241520f0bb
Cleans up autospawn, now uses existing code for selecting and choosing
...
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04:00
e381e2faf2
Fixes do_not_announce parameters not actually doing anything
2015-10-11 12:18:01 -04:00
43d5f2e3bd
Ensures leftover candidates and pending antags are cleared after finalizing
2015-10-11 11:39:26 -04:00
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
aaba2c5c8c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
c7070dd7f7
Merge pull request #11251 from PsiOmegaDelta/151006-JobReport
...
Antagonist summary printout now prefers assignment over special role.
2015-10-06 19:26:42 +03:00
ec097d928a
Antagonist summary printout now prefers assignment over special role.
...
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817 .
2015-10-06 09:19:40 +02:00
91faf8555f
Antag placement now favors mobless turfs.
...
If one such turf is available, otherwise picks a random populated turf. Fixes #11237 .
2015-10-05 10:13:05 +02:00
8eee143177
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
baystation12.dme
2015-10-01 09:48:51 +02:00
709840f848
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/DB ban/functions.dm
2015-09-26 08:48:37 +02:00
145d8d91ef
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
c987fedc24
Merge pull request #11180 from BlueNexus/patch-1
...
Gave Asset Protection their proper rig
2015-09-25 14:09:28 +01:00
76f06e6e9b
Gave Asset Protection their proper rig
...
Fairly self explanatory.
2015-09-23 13:29:54 +01:00
280c932add
fix traitor AIs not getting a law zero
2015-09-23 12:26:53 +01:00
d37bf5fe2f
Updating to new dev antagonist code.
2015-09-21 20:38:19 +09:30
9ce56f3f91
Correctly intends a world-message.
2015-09-10 08:05:35 +02:00
6a956d0d0a
Uplink fixes.
...
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
2015-09-08 08:43:40 +02:00
1633cde787
Adds missing </font>
2015-09-07 08:18:53 +02:00
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
9d5f14298d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
3bb0e2503a
Merge pull request #11020 from Zuhayr/antagsystem
...
More antag fixes.
2015-09-06 02:47:12 +01:00
efa995b372
Should fix antag scaling.
2015-09-06 10:53:32 +09:30
90c9d31782
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 18:51:17 +09:30
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
8191ff658e
Compilation and code relocation.
2015-09-05 09:29:12 +02:00
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
f74182680c
Fixes autotraitor.
2015-09-05 13:15:30 +09:30
7af1f27b28
More debug feedback.
2015-09-05 12:57:20 +09:30
c121993a11
Changed some vars around to be more explicit/descriptive, added documentation to main antag datum.
2015-09-05 11:23:48 +09:30
553ac01552
Autotraitor cleanup.
2015-09-04 20:17:47 +09:30
Neerti