Commit Graph

1848 Commits

Author SHA1 Message Date
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
mwerezak
4af4e38571 Fixes #10368 2015-07-29 22:48:11 -04:00
GinjaNinja32
57e8d07085 Adds a log_and_message_admins call to cult communication rune 2015-07-28 13:29:50 +01:00
Zuhayr
64ccd8a048 Merge pull request #10269 from Mloc/lightwrite
lighting work
2015-07-27 11:41:14 +09:30
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
2015-07-26 10:00:12 +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
006ed3ec53 Fixes typo in changeling absorbing 2015-07-24 02:35:49 +01:00
Mloc
65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight"
This reverts commit 278a4c38ec.
2015-07-22 15:14:40 +01:00
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
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
Ccomp5950
889019b445 Merge pull request #10163 from PsiOmegaDelta/150713-Fixes
Fixes
2015-07-13 09:35:58 -04:00
PsiOmega
750c3f9e66 Puts the world end handling inside a spawn instead of sleep. 2015-07-13 10:13:45 +02:00
GinjaNinja32
b04ed47e2f Merge pull request #10070 from Mloc/lightwrite-2
Lighting overlay changes + optimizations
2015-07-12 15:51:44 +01:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-09 19:17:04 +01:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag
Based on https://github.com/d3athrow/vgstation13/pull/5273.
2015-07-07 12:55:39 +02:00
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
94ffb49bfb Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end 2015-06-26 01:04:03 +01:00
PsiOmegaDelta
fdab654beb Grid check now respects critical APC status.
Fixes #9919.
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
2015-06-25 14:12:05 +02:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
GinjaNinja32
9613fae16a Wizard suits will now be refitted automatically for non-human wizards 2015-06-13 13:43:51 +01:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection
Fixes #5945, de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Atlantis
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02: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
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/toys.dm
2015-05-26 08:26:48 +02:00