PsiOmegaDelta
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02: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
Neerti
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
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
PsiOmegaDelta
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
PsiOmegaDelta
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
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
Kelenius
f3effa8df7
Basic encryption hack popup only shows suitable APCs
2015-10-05 11:40:19 +03:00
PsiOmegaDelta
e74d586c99
Merge pull request #11186 from Baystation12/dev-freeze
...
Dev
2015-09-24 08:26:42 +02:00
PsiOmegaDelta
61a4d3b7af
Merge pull request #11185 from Baystation12/master
...
Dev-freeze
2015-09-24 08:17:45 +02:00
Daranz
ebaa452c4c
Fix spelling: 'its' in place of 'it's'
2015-09-21 15:37:22 +02:00
PsiOmegaDelta
d65ebf8b90
Meteor events are now direction biased.
...
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
2015-09-18 21:45:15 +02:00
PsiOmegaDelta
eb2151c118
Meteors no longer impact with each other.
...
This increases the number of meteors which survive to reach the station, as there is some tendency for them to spawn on the same location (but not necessarily fly in the same direction).
2015-09-17 09:08:09 +02:00
mwerezak
26f1d02bda
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-09-11 18:13:14 -04:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
PsiOmegaDelta
cbd621ae41
Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses
2015-09-09 08:18:26 +02:00
mwerezak
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00
PsiOmegaDelta
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
PsiOmegaDelta
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
PsiOmegaDelta
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
Zuhayr
412ee32d1c
Stops autotraitor grabbing minds from the lobby for antag roles.
2015-09-07 17:01:34 +09:30
Zuhayr
479e637823
Merge pull request #10398 from Soadreqm/patch-1
...
Increase changeling genetic points
2015-09-07 14:01:42 +09:30
Zuhayr
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
Zuhayr
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
Zuhayr
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
Neerti
bedeb1fdff
Hopefully fixes some bugs that came out of that merge.
2015-09-06 20:00:01 -04:00
Neerti
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
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
3951b1d62c
Added a handful of new mixed-antagonist modes.
2015-09-05 18:05:39 +09:30
Zuhayr
89a7c9667b
Reverts a testing value.
2015-09-05 17:31:27 +09:30
PsiOmega
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
PsiOmega
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
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
