Commit Graph

100 Commits

Author SHA1 Message Date
PsiOmegaDelta
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
Chinsky
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
HarpyEagle
ffb26a6f87 Adds checks for antags being dead or SSD 2015-10-14 14:57:52 -04:00
PsiOmegaDelta
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
HarpyEagle
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
HarpyEagle
e381e2faf2 Fixes do_not_announce parameters not actually doing anything 2015-10-11 12:18:01 -04:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04:00
Chinsky
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
PsiOmegaDelta
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
PsiOmegaDelta
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
GinjaNinja32
c987fedc24 Merge pull request #11180 from BlueNexus/patch-1
Gave Asset Protection their proper rig
2015-09-25 14:09:28 +01:00
BlueNexus
76f06e6e9b Gave Asset Protection their proper rig
Fairly self explanatory.
2015-09-23 13:29:54 +01:00
GinjaNinja32
280c932add fix traitor AIs not getting a law zero 2015-09-23 12:26:53 +01:00
PsiOmega
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
GinjaNinja32
3bb0e2503a Merge pull request #11020 from Zuhayr/antagsystem
More antag fixes.
2015-09-06 02:47:12 +01:00
Zuhayr
efa995b372 Should fix antag scaling. 2015-09-06 10:53:32 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
Zuhayr
f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
c121993a11 Changed some vars around to be more explicit/descriptive, added documentation to main antag datum. 2015-09-05 11:23:48 +09:30
Zuhayr
553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr
09ee98717e Fixes cortical borer spawning. 2015-09-04 19:19:29 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
mwerezak
c16d4aca9a Removes unncessary shuffle 2015-08-23 14:49:30 -04:00
mwerezak
161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
mwerezak
20eeb394cb Fixes #10793 2015-08-23 14:34:37 -04:00
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
GinjaNinja32
9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3
Fixes #10723
2015-08-18 18:51:37 +01:00
mwerezak
b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
Zuhayr
5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode
Gamemode fixes
2015-08-17 18:50:58 -07:00
mwerezak
87da0d4eb5 Fixes missing ), "spam" class 2015-08-17 21:24:59 -04:00
mwerezak
3ea5bfb131 Makes error message print to admins instead of world 2015-08-17 21:12:40 -04:00
mwerezak
e84f693219 Fixes certain antag roles from being unspawnable
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
2015-08-17 21:11:57 -04:00
mwerezak
e1f4551693 Fixes revs being unspawnable
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
2015-08-17 21:04:23 -04:00
mwerezak
ef8e3a94a0 Fixes antag datum not respecting restricted_jobs depending on config
Fixes #10657
2015-08-17 21:00:22 -04:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
GinjaNinja32
54930b69b4 Malfunction 2015-08-12 04:41:59 +01:00
Chinsky
4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName
Fixes #10468 and #10467
2015-08-11 19:39:15 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmegaDelta
f85e9146ab Fixes #10468. Fixes #10467.
Updates the DNA name as well, upon antag name change.
2015-08-11 12:11:32 +02:00
mwerezak
d25d0c700c Fixes #10403
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
2015-08-03 20:01:55 -04:00
mwerezak
76ceaa904b Fixes admin or event spawned antags not spawning
Pending players were selected but the antag roles were never finalized.
2015-08-03 12:06:23 -04:00
mwerezak
2e1607f611 Fixes #10414
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
2015-08-03 12:03:08 -04:00
HarpyEagle
7feaf13d81 Fixes #10309
Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way.
Moves the selection of pending antags outside of can_start().
Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.
2015-07-30 22:28:17 -04:00
Zuhayr
ad63247749 Merge pull request #10382 from Mloc/freezyfixes
fixes
2015-07-31 03:55:34 +09:30
Mloc
3461b7fb5c minor antag distribution fix
Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-30 19:17:17 +01:00
Atlantis
e10a1f3e01 Mercenaries/Raiders should now have proper headset again
- This should fix #10313
2015-07-28 10:48:22 +02:00
PsiOmegaDelta
1c7b860783 Spells are now restored when cloning. 2015-07-21 11:34:26 +02:00