Commit Graph

1878 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
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood
Limits the number of runes to one per turf.
2015-10-21 01:56:08 +03:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf.
Fixes #11248.
2015-10-19 12:49:32 +02:00
PsiOmegaDelta
03447fb609 Malf announcement type change.
Malf announcements are now command instead of priority announcements.
This will make them be logged by newscasters. Fixes #11325.
2015-10-17 16:01:49 +02: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
PsiOmegaDelta
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster
Pointed secret changes to master
2015-10-13 20:27:56 +02:00
Kearel
78956843a8 Pointed secret changes to master
New gamemodes on dev will still need to be changed.
2015-10-13 12:30:52 -05:00
HarpyEagle
c0dc32d60c If an antag could not be auto-spawned, the game rechecks in the minimum time. 2015-10-12 13:03:51 -04: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
c7afded12d Cleans up calamity shuffle, makes sure antag types are selected in a random order for other game modes. 2015-10-11 12:18:01 -04:00
HarpyEagle
d715e0645f Removes unused latejoin template list 2015-10-11 12:02:04 -04:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04:00
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04:00
Kelenius
f3effa8df7 Basic encryption hack popup only shows suitable APCs 2015-10-05 11:40:19 +03:00
Daranz
ebaa452c4c Fix spelling: 'its' in place of 'it's' 2015-09-21 15:37:22 +02:00
Zuhayr
412ee32d1c Stops autotraitor grabbing minds from the lobby for antag roles. 2015-09-07 17:01:34 +09:30
Chinsky
d99c4ffaaa Merge pull request #11021 from Zuhayr/antagsystem
Forgot a couple of tweaks.
2015-09-06 08:06:48 +03:00
Zuhayr
eacc1e7da7 Tweaks. 2015-09-06 11:19:54 +09:30
GinjaNinja32
3bb0e2503a Merge pull request #11020 from Zuhayr/antagsystem
More antag fixes.
2015-09-06 02:47:12 +01:00
Zuhayr
111ff96312 Should fix antag candidate selection. 2015-09-06 10:59:59 +09:30
Zuhayr
b09e836d95 Removed an unused file. 2015-09-05 18:51:39 +09:30
Zuhayr
89a7c9667b Reverts a testing value. 2015-09-05 17:31:27 +09:30
Zuhayr
a0187f66e3 Fixes Secret. 2015-09-05 14:12:20 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +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
12a5c47413 Added a proper cooldown on latespawn, added loyalist role to char setup. 2015-09-05 10:46:23 +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
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
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
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans
Newmalf Fixes
2015-08-15 03:36:35 +01:00
Atlantis
e7adce2163 Better feedback
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
2015-08-14 22:51:59 +02:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
GinjaNinja32
5a1c80d843 Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix 2015-08-12 05:06:18 +01:00
GinjaNinja32
54930b69b4 Malfunction 2015-08-12 04:41:59 +01:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
SomeoneElse
64c59d3145 replace \red usages with various <span> usages in runes.dm
code/game/gamemodes/cult/rules.dm:
	replaced {\red,\b} with <span class='{danger,warning,cult}'>.
	added some span class guidelines esp. on cult for future consistency.
2015-08-10 12:58:37 +03:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix
Material stack related fixes
2015-08-08 09:56:25 +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
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
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix
Fixes #10309
2015-07-31 10:26:14 +02:00
PsiOmegaDelta
3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-07-31 09:48:15 +02: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