79c5f4a1a8
Makes a line more readable. Thanks GinjaNinja32.
2015-12-02 13:22:14 -05:00
b002a75539
Makes round-end last five minutes instead of one, with a per-minute countdown.
2015-12-02 12:32:28 -05:00
53cbd2bbe0
Alters the secret player requirements for various game modes:
...
https://docs.google.com/document/d/1oCuSNmWOhNOzGk9AHmZeVhFPX9Qr0LHSqyxH7ocaXD0/edit
2015-11-28 23:08:11 +00:00
78e5701b5c
Replaces most instances of Nyx to Vir.
2015-11-26 01:01:06 -05:00
4da0c6b574
Removes world << output, tries to add thanksgiving on the correct date.
2015-11-25 22:19:43 -05:00
31e3bd29cc
Refactors holiday system slightly. It's now a list based system, so you can have multiple holidays on the same day, in case you wanted to do that.
...
Removes the dumb Holidays.
Adds more real life and fictional holidays, and adds a blurb for all of them.
2015-11-23 09:28:34 -05:00
dd3ab4dac0
Finishes new ling, need better sprites but that's for another time.
2015-11-18 16:20:28 -05:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
b1fe5e3eab
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
e81f42840a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
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
92c1c468e4
Despite the name, they're not done, because reasons.
2015-10-29 21:22:42 -04:00
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
0b9b8feb1e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
db833735a8
Merge pull request #11340 from Baystation12/master
...
Dev-freeze.
2015-10-21 10:36:30 +02:00
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
b92be265ee
Limits the number of runes to one per turf.
...
Fixes #11248 .
2015-10-19 12:49:32 +02:00
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
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
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
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
e41131368b
Compilation fixes.
2015-10-14 08:43:38 +02:00
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
a19829e968
Merge pull request #11289 from Kearel/secRemoveMaster
...
Pointed secret changes to master
2015-10-13 20:27:56 +02:00
78956843a8
Pointed secret changes to master
...
New gamemodes on dev will still need to be changed.
2015-10-13 12:30:52 -05:00
c0dc32d60c
If an antag could not be auto-spawned, the game rechecks in the minimum time.
2015-10-12 13:03:51 -04:00
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
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
d715e0645f
Removes unused latejoin template list
2015-10-11 12:02:04 -04:00
43d5f2e3bd
Ensures leftover candidates and pending antags are cleared after finalizing
2015-10-11 11:39:26 -04:00
dec0629fae
Renames latespawn() to be less confusing
2015-10-11 11:26:24 -04:00
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
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
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
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
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
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
f3effa8df7
Basic encryption hack popup only shows suitable APCs
2015-10-05 11:40:19 +03:00
e74d586c99
Merge pull request #11186 from Baystation12/dev-freeze
...
Dev
2015-09-24 08:26:42 +02:00
61a4d3b7af
Merge pull request #11185 from Baystation12/master
...
Dev-freeze
2015-09-24 08:17:45 +02:00
ebaa452c4c
Fix spelling: 'its' in place of 'it's'
2015-09-21 15:37:22 +02:00
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
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
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
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
cbd621ae41
Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses
2015-09-09 08:18:26 +02:00
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
Neerti