Commit Graph

207 Commits

Author SHA1 Message Date
PsiOmegaDelta
93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze
Dev
2015-08-04 13:07:11 +02: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
Zuhayr
82152daa30 Merge pull request #10393 from Baystation12/dev-freeze
Dev freeze
2015-07-31 18:59:03 +09:30
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
PsiOmega
bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +02:00
PsiOmega
13ca02677c Fixes #10203.
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
2015-07-25 14:08:19 +02:00
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
2015-07-14 08:21:12 +02:00
Zuhayr
cd380aba24 Removed the last few references to MODE, fixed some oversights with player_is_antag(). 2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
Chinsky
026500ea06 Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade 2015-06-05 11:26:25 +03:00
Chinsky
e5a8eb2dfc Actually renames 'going' var.
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
GinjaNinja32
d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
2015-05-29 21:55:37 +01:00
GinjaNinja32
de4f085057 code/game, excluding code/game/machinery and code/game/objects 2015-05-29 21:51:27 +01:00
PsiOmega
bcb1ea5413 Endgame tweaks.
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
2015-05-26 12:29:50 +02:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Github is ok, I guess
77206c6f5f Update gameticker.dm 2015-05-17 10:36:59 +01:00
PsiOmega
729a7a3ec9 Gamestart cleanup.
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
2015-05-16 10:59:45 +02:00
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Atlantiscze
c34b8850a6 Fix
- Malfunction gamemode should now be startable. Probably not the nicest way to do it, but since the antag system is not documented at all i have no idea how to do it in nicer way.
2015-05-06 01:31:13 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
2015-05-05 08:11:28 +02:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
PsiOmega
d59ff1e1f9 Begins work to remove the need for spawn() in New() procs. 2015-04-27 08:23:54 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Zuhayr
8475be5d4e Fixes a few incidental bugs with the antag and organ changes. 2015-04-01 06:33:47 -07:00
Zuhayr
03d5c2a5cd Fixes #8619 2015-04-01 05:55:34 -07:00
Zuhayr
4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Graham Lloyd
160183ebd5 finishes work on adapting the goon process scheduler for BS12. 2015-03-04 05:14:36 -05:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Chinsky
9e818ef52f Merge pull request #6983 from PsiOmegaDelta/Event
Event Manager Control
2014-11-12 23:45:02 +03:00
PsiOmega
0602200dd6 Round-end report. 2014-11-10 19:20:16 +01:00
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
bs12
a6934a531b gameticker.dm crash fix
Signed-off-by: bs12 <bs12@bs12.bs12>
2014-11-01 16:17:18 +00:00
PsiOmega
bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
f31ffb11c2 Fixes #6752 2014-10-18 08:09:50 +10:30
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Chinsky
200a1c0d01 Merge pull request #6328 from atlantiscze/malf-explode-fix
Malfunction Explode Fix
2014-09-14 21:48:57 +04:00
Atlantiscze
9ff1f94152 Round end spam fix
- This ensures that "The round has ended" message is shown only once, instead of being spammed under certain circumstances.
2014-09-12 17:24:57 +02:00
PsiOmega
98bc0d5f60 Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback. 2014-09-05 11:00:47 +02:00
PsiOmega
3377ca1bfb Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus. 2014-08-25 07:37:59 +02:00
Zuhayr
9eefdf4db8 A bit of prep work for integegrating player-set backgrounds into gameplay. 2014-08-01 22:54:57 +09:30