diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 13f337c1f7..50e1521518 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -59,6 +59,14 @@ var/datum/subsystem/events/SSevent
/datum/subsystem/events/proc/reschedule()
scheduled = world.time + rand(frequency_lower, max(frequency_lower,frequency_upper))
+ if(world.time > 108000) //3 hours
+ frequency_lower=1000
+ frequency_upper=1500
+ if(SSshuttle.emergency.mode < SHUTTLE_CALL)
+ SSshuttle.emergency.request(null, 1.5)
+ log_game("Round time limit reached. Shuttle has been auto-called.")
+ message_admins("Round time limit reached. Shuttle called.")
+
//selects a random event based on whether it can occur and it's 'weight'(probability)
/datum/subsystem/events/proc/spawnEvent()
if(!config.allow_random_events)
diff --git a/html/changelog.html b/html/changelog.html
index 36171d21ce..9104adf34e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,398 +55,19 @@
-->
+
06 September 2016
+
Jay updated:
+
+ - Changed max slave slots to 10.
+ - Added auto-end shuttle; 3 hours.
+
+
15 August 2016
Jay updated:
- Fixes taur sprites
- Re-enables taurs
-
-
02 July 2016
-
Joan updated:
-
- - Clockwork Proselytizers can now reform stored alloy into usable component alloy when used in-hand.
- - Mending motors start with 2500W of power in alloy, from 5000. Sigils of Transmission start with 2500W of power, from 4000. Clockwork Proselytizers start with 90 alloy, from 100.
- - Umbras have been removed.
- - Revenants have been readded, though they are now vulnerable to salt piles.
-
-
MMMiracles updated:
-
- - Added the power fist, a gauntlet with a piston-powered ram attached to the top for traitors to punch people across the station. Punch people into walls for added fun.
-
-
incoming5643 updated:
-
- - Nuke ops can now harness the power of METAL BOXES: special versions of cardboard boxes that can take a lot of abuse and can fit the whole team if need be. They're not nearly as light as their cardboard brothers though...
-
-
kevinz000 updated:
-
- - Some new emojis have been added to OOC for your enjoyment. Try them out.
- - New emojis are : coffee, trophy, tea, gear, supermatter, forceweapon, gift, kudzu, dosh, chrono, nya, and tophat. Type :nameofemoji: in OOC to use.
-
-
-
01 July 2016
-
Flavo updated:
-
- - fixed a bug where lights would not update.
-
-
Joan updated:
-
- - Clockwork Slabs now use an action button to communicate instead of the "Report" option in the menu after using a slab.
- - Clockwork Slabs now fit in pockets, the belt slot, or in the suit storage slot(if wearing clockwork armor), where they can be used as hands-free communication.
- - Clockwork items with action buttons have a new, clockwork-y background.
- - Judicial Visors now tell the user how many targets the Judicial Blast struck.
- - Judicial Markers now have sounds when appearing and exploding.
- - Wet turfs should remain that way for slightly longer than 5 seconds now.
- - Drones and Swarmers should now sound more robotic.
- - Ratvarian Spears will stun cyborgs and cultists for twice as long when thrown; on cyborgs, this should be long enough to use Guvax on them.
- - Removed the Justicar's Gavel application scripture.
- - Vitality Matrices will drain and heal 50% faster, and the base cost to revive is 20% lower; 20, from 25.
- - Vitality Matrices will not revive or heal corpses unless they can grab the ghost of the corpse, and will immediately grab the ghost when reviving.
- - Swarmers consuming swarmer shells now refunds the swarmer the entire cost of the shell instead of 2% of the shell's cost.
- - Application scriptures require at least 75 CV, from 50.
- - Revenant scriptures require at least 4 Caches, from 3, and at least 150 CV, from 100.
- - Judgement scripture requires at least 12 servants, from 10, 5 Caches, from 3, and at least 250 CV, from 100.
- - Script and Application scripture have had their component costs and requirements tweaked to reduce overuse of certain components.
- - Invoke times for a few scriptures that were instant are now very short instead.
-
-
Kor updated:
-
- - Holoparasites are no longer in the uplink
-
-
NikNak updated:
-
- - Showcases are now movable and deconstructable. Wrench them to unanchor and then screwdriver and crowbar to deconstruct.
-
-
Papa Bones updated:
-
- - Security now has energy bolas available to them in their vending machines, check them out!
-
-
bobdobbington updated:
-
- - Added skub to the AutoDrobe as a premium item.
-
-
coiax updated:
-
- - The CTF arena regenerates every round, and the blue team now shoot blue lasers.
- - Adds some descriptions to alien surgery tools
- - The agent vest can be locked and unlocked (toggling the NODROP flag)
- - An abductor team can spend data points to purchase an agent vest (note that only abductor agents are trained in their use)
- - The nuke disk reappears on the station in far more random locations, but tends to re-materialise in safe pressurised areas that aren't on fire.
-
-
name: Lzimann updated:
-
- - Mulebots with pAI cards no longer stun people
-
-
-
29 June 2016
-
Joan updated:
-
- - Ghosts spawning via Ratvar can now choose to spawn as a Cogscarab with a usable slab instead of as a Reclaimer.
- - You can no longer permanently block hostile simple mobs with sandbags and other barricades.
-
-
MrStonedOne updated:
-
- - Ghosts may now jump between the two linked servers using the new Server Hop verb. Rather than whine in deadchat about dieing, you can just go play a new round on the other server.
-
-
coiax updated:
-
- - Adds a new UI to slimepeople, allowing them to select more easily which body to swap to
- - Slimepeople swapping consciousness between bodies is now visible to onlookers
- - The AI malfunction "Hostile Lockdown" power now restores the station doors to normal after 90 seconds, rather than keeping everything shut forever.
-
-
-
28 June 2016
-
CoreOverload updated:
-
- - Kinetic accelerator now supports seclite attachment.
- - All cyborgs have been outfitted with ash-proof plating.
- - Mining cyborg module now includes a welder and a fire extinguisher.
- - Mining cyborgs now have a new upgrade: lavaproof tracks.
-
-
Joan updated:
-
- - Clockwork Marauders are no longer totally invincible to damage unless a holy weapon was involved.
- - Clockwork Marauders will take damage when attacked, but unless they're fighting excessive amounts, they'll be forced to return to their host before they'd normally die.
- - A holy weapon held in either hand in the presence of a marauder will massively increase the damage they take, making it much more likely the marauder can be killed.
- - Clockwork Marauders do slightly less damage at low fatigue levels.
- - Clockwork Marauders now have a chance to block melee attacks, negating the damage from them, and an additional chance to immediately counter, attacking whoever tried to attack them.
- - If Ratvar has awoken, Marauders have a much higher chance to block and counter, will block thrown items and projectiles, and gradually regenerate.
- - Clockwork Marauders no longer have a verb to communicate; they instead use :b to do so.
- - Faked deaths are now effectively indistinguishable from real deaths.
-
-
MMMiracles updated:
-
- - Adds some ruins for space and lavaland. Balance not included.
- - Adds spooky ghosts.
-
-
SnipeDragon updated:
-
- - Cardboard Cutouts now become opaque when their appearance is changed.
-
-
Wizard's Federation updated:
-
- - Acolytes of Hades have been scolded for gluing their clothes to themselves, and their clothes can now be cut off them.
- - Hades has learned a few new tricks, to ensure the ultimate demise of his target.
- - Hades has faced a council of his repeated use of time magic inside chapels, and as it was deemed unholy, he will no longer do it.
- - Wizards of the Wizard's Federation have been granted access to Dark Seeds, ancient relics used to call upon Hades in a time of need.
-
-
Xhuis updated:
-
- - You can no longer put paper cups back onto water coolers. In addition, they're now just called "liquid coolers" instead of changing based on their contents.
-
-
coiax updated:
-
- - Status displays added to a variety of shuttle templates.
- - Large graffiti now consumes 5 uses from limited use crayons and spraycans, as well as taking three times the amount of time to draw.
- - All items inside the supply shuttle will now be sold, regardless of whether they're inside a container or not.
- - Fixes issue where the AI core APC on Metastation would not charge.
-
-
name: Lzimann updated:
-
- - Engineer and atmos wintercoat can hold the RPD now!
-
-
optional name here updated:
-
- - Shadowlings have been completely removed.
-
-
oranges updated:
-
- - You can now hear dice
-
-
timkoster1 updated:
-
- - adds a hud soul counter for devils. Sprites by PouFrou and special thanks to lordpidey for about everything.
-
-
-
26 June 2016
-
Basilman updated:
-
- - The Donor prompt for becoming an alien queen maid is now an action button instead, and can be toggled on and off.
-
-
Joan updated:
-
- - Fellowship Armory now invokes faster for each nearby servant and provides clockwork gauntlets, which are shock-resistant and provide armor to the arms.
- - It's not wise to equip clockwork armor if you don't serve Ratvar.
- - A full set of clockwork armor will now actually cover all limbs.
-
-
coiax updated:
-
- - Our administrators, here at /tg/, don't get enough credit for their wealth of experience and knowledge. Now they get the chance to share that with you by giving out custom tips!
- - Gang domination now uses the same timing method as shuttles, making their domination times more accurate.
- - The default shuttle transit time is now 15 seconds.
- - Please do not commit suicide with the nuclear authentication disk.
- - Observers now have a visible countdown for borg factories, silicons can examine the factory to determine how long it has remaining until it is ready.
- - Clockwork mobs sound like Ratvar chants if you do not serve Ratvar.
- - When servants recite, they now talk in a strange voice that is more noticable.
-
-
-
24 June 2016
-
Joan updated:
-
- - The Interdiction Lens has been reworked; instead of allowing you to disable Telecomms, Cameras, or non-Servant Cyborgs, it drains power from all APCs, SMES units, and non-Servant cyborgs in a relatively large area, funneling that power into nearby Sigils of Transmission, then disables all cameras and radios in that same area.
- - If it fails to find anything it could disable or drain any power, it turns off for 2 minutes.
- - You can now target yourself with Sentinel's Compromise, allowing you to heal yourself with it.
- - Flashes will once again stun borgs, but for a much shorter time than they previously did; average stun time is reduced from the previous average of 15 seconds to about 6 seconds. The confusion remains, but it will no longer unequip borg modules.
-
-
MMMiracles updated:
-
- - Metastation xenobiology's lights and cell have been modified so it won't drain 5 minutes into the round.
-
-
SnipeDragon updated:
-
- - Changelings created at round start now correctly receive their Antag HUD.
-
-
Xhuis updated:
-
- - Cardboard cutouts have been added. Now you can set up advertisements for your clown mart.
-
-
-
23 June 2016
-
Joan updated:
-
- - Tinkerer's Caches generate components(when near clockwork walls) every minute and a half, from every 35 seconds. Clockwork Slabs generate components once per minute, from once per 50 seconds.
- - Spatial Gateway will last four seconds per invoker, instead of two per invoker.
- - Clockwork floors now only heal toxin damage on servants of Ratvar.
- - You can no longer place ocular wardens very close to other ocular wardens.
- - The Flame produced by a Judicial Visor is no longer an effective melee weapon and will trigger on all intents, not just harm intent.
-
-
Wizard's Federation updated:
-
- - Acolytes of Hades have revealed their true forms.
- - We've discovered a way to traverse portals left behind by Hades, and have discovered a great treasure through it.
- - Hades has undergone Anger Management classes, and should no longer remain wrathful for the duration of his visit.
-
-
coiax updated:
-
- - Changelings now evolve powers via the cellular emporium, which they can access via an action button.
- - Due to budget cuts, the shuttle's hyperspace engines now create a visual distortion at their destination, a few seconds before arrival. Crewmembers are encouraged to use these "ripples" as an indication of where not to stand.
- - Shuttles now only run over mobs in turfs they are moving into, rather than the entire rectangle.
- - If you are an observer, you can click on transition edges of a Z-level in order to move as a mob would.
- - Due to safety concerns, the Hyperfractal Gigashuttle now has some safety grilles to prevent accidental matter energising.
-
-
coiax, incoming updated:
-
- - Due to budget cuts, the builtin anti-orbit engines on the station have been removed. As such, expect the station to start orbiting the system again, and encounter an unpredictable stellar environment.
- - All permanent structures (not on station, Centcom or lavaland) have been removed.
- - All removed structures are now space ruins, and can be placed randomly in space ruin zlevels.
- - The White Ship remains at its current location, but has lost any reliable landmarks near it. Its starting position will be made more random in a coming update.
- - The Space Bar has a small atmos system added and a teleporter. Some other ruins have been cleaned up to not have atmos active turfs.
-
-
-
22 June 2016
-
Cheridan updated:
-
- - Flashes no longer stun cyborgs, instead working almost exactly like a human, causing them to become confused and unequip their current module.
-
-
Joan updated:
-
- - Those who do not serve Ratvar cannot understand His creations.
- - You can now repair clockwork structures with a clockwork proselytizer. This is about a third as efficient as a mending motor, costing 2 liquified alloy to 1 health, and also about a third as fast.
- - Scarab proselytizers are more efficient and will reap more alloy from metal and plasteel.
- - They can also directly convert rods to alloy.
- - Nuclear bombs will no longer explode the station if in space. Please be aware of this.
-
-
Kor updated:
-
- - You can now pick up potted plants.
-
-
PKPenguin321 updated:
-
- - You can now pick up a skateboard and use it as a weapon by dragging it to yourself.
- - Skateboards have been given brand new sprites, courtesy of JStheguy
-
-
Quiltyquilty updated:
-
- - The AI is back in the center of the station. The gravity generator is now where the SMES room used to be. The SMESes are in the equipment room.
-
-
Supermichael777 updated:
-
- - Flaps are no longer space-racist and now accept all bots.
-
-
Xhuis updated:
-
- - Holy weapons, such as the null rod and possessed blade, now protect from Ratvar's magic.
-
-
coiax updated:
-
- - Certain custom station names may be rejected by Centcom.
- - Drone shells can be ordered in Emergency supplies at Cargo.
-
-
-
20 June 2016
-
Kor updated:
-
- - Cult runes can only be scribed on station and on mining.
- - The comms console now has a new option allowing you to communicate with the other server.
-
-
Quiltyquilty updated:
-
- - The detective has been moved to above the post office.
-
-
coiax updated:
-
- - Birdboat's supply loop has been split into two unconnected halves, to maintain award winning air quality.
-
-
incoming5643 updated:
-
- - New abilities for some races!
- - Skeletons (liches) and zombies now are much more susceptible to limb loss, but can also reattach lost limbs manually without surgery.
- - Slimepeople can now lose their limbs, but also can regenerate them if they have the jelly for it. Additionally slimepeople will (involuntarily) lose limbs and convert them to slime jelly if they're extremely low on jelly.
- - Zombies and slimepeople now have reversed toxic damage, what usually heals now hurts and what usually hurts now heals. Keep in mind that while you could for example heal with unstable mutagen, you'd still mutate. Beware of secondary effects! Drugs like antitoxin are especially dangerous to these races now since not only do they do toxin damage, but they remove other toxic chems before they can heal you. Be wary also of wide band healing drugs like omnizine.
- - For slime people the above mechanic also adds/drains slime jelly. So yes inhaling plasma is now a valid way to build jelly (but you'll still suffocate if there's no oxygen).
- - Pod people now mutate if shot with the mutation setting of the floral somatoray.
-
-
-
19 June 2016
-
Joan updated:
-
- - Assassin holoparasite attack damage increased from 13 to 15, stealth cooldown decreased from 20 seconds to 16 seconds.
- - Charger holoparasite charge cooldown decreased from 5 seconds to 4 seconds.
- - Chaos holoparasite attack damage decreased from 10 to 7, range decreased from 10 to 7.
- - Lightning holoparasite attack damage increased from 5 to 7, chain damage increased by 33%.
- - Clock cult scripture unlock now only counts humans and silicons.
- - Servants of ratvar can now create cogscarab shells with a Script scripture. Adding a soul vessel to one will produce a small, drone-like being with an inbuilt proselytizer and tools.
- - Clockwork mobs have their own speechbubble icons.
- - Invoking Sevtug now causes massive hallucinations, brain damage, confusion, and dizziness for all non-servant humans on the same zlevel as the invoker.
- - Invoking Sevtug is no longer mind control. RIP mind control 2016-2016.
- - Clockwork slabs now produce a component every 50 seconds, from 40, Tinkerer's Caches now produce(if near a clockwork wall) a component every 35 seconds, from 30.
- - Tinkerer's daemons have a slightly higher cooldown for each component of the type they chose to produce that's already in the cache: This is very slight, but it'll add up if you have a lot of one component type and are trying to get more of it with daemons; 5 of a component type will add a second of delay.
-
-
Kor and Iamgoofball updated:
-
- - Miners can now purchase fulton extraction packs.
- - Miners can now purchase fulton medivac packs.
- - Two new fulton related bundles are available for purchase with vouchers.
-
-
Quiltyquilty updated:
-
- - Beepsky now has his own home in the labor shuttle room.
-
-
Wizard's Federation updated:
-
- - We've fired the old Pope, who was actually an apprentice in disguise. We've a-pope-riately replaced him with a much more experienced magic user.
- - Some less-then-sane people have been sighted forming mysterious cults in lieu of recent Pope sightings, lashing out at anyone who speaks ill of him.
- - We've rejiggered our trans-dimensional rifts, and almost all cases of clergy members being flung into nothingness should be resolved.
- - All members of the Space Wizard's Clergy have been appropriately warned about usage of skin-to-stone spells, and such there should be no more instances of permanent statueification.
-
-
Xhuis updated:
-
- - Revenants have been renamed to umbras and have undergone some tweaks.
-
-
coiax updated:
-
- - Drones can hear robotic talk, but cannot communicate on it. AIs and cyborgs are encouraged to share information with station repair drones.
- - Potted plants can now be ordered from cargo.
- - AI turrets no longer fire at drones.
-
-
-
16 June 2016
-
GunHog updated:
-
- - In response to alarmingly high mining cyborg losses, Nanotrasen has equipped the units with an internal positioning beacon, as standard within the module.
-
-
Joan updated:
-
- - You can now strike a Tinkerer's Cache with a Clockwork Proselytizer to refill the Proselytizer from the global component cache.
- - The Clockwork Proselytizer requires slightly less alloy to convert windows and windoors.
- - Several clockwork objects have more useful descriptions, most notably including structures, which will show a general health level to non-servants and exact health to servants.
- - The Clockwork Proselytizer has new, more appropriate inhands.
- - Invoking Inath-Neq, the Resonant Cogwheel, now gives total invulnerability to all servants in range for 15 seconds instead of buffing maximum health.
- - Impaling a target with a ratvarian spear no longer breaks the spear.
- - Judicial Markers(the things spawned from Ratvar's Flame, in turn spawned from a Judicial Visor) explode one second faster.
- - Removed Dementia Doctrine, replacing it with an Application sigil.
- - Adds the Sigil of Accession, the previously-mentioned Application sigil, which is much like a Sigil of Submission, except it isn't removed on converting un-mindshielded targets and will disappear after converting a mindshielded target.
- - Sigil of Submission is now a Script instead of a Driver; It's unlocked one tier up, so you have to rely on the Drivers you have until you get Scripts, instead of spamming both Driver sigils for free converts.
- - To replace Sigil of Submission in the Driver tier; Added Taunting Tirade, which is a chanted scripture with a very fast invocation, which, on chanting, confuses, dizzies, and briefly stuns nearby non-servants and allows the invoker a brief time to relocate before continuing the chant.
- - Ghosts can now see the Gateway to the Celestial Derelict's remaining time as a countdown.
- - Anima Fragments are now slightly slower if not at maximum health and no longer drop a soul vessel when destroyed.
-
-
Quiltyquilty updated:
-
- - Patches now hold only 40u.
- - Patches in first aid kits now only contain 20u of chemicals.
-
-
coiax updated:
-
- - Polymorphed mobs now have the same name, and where possible, the same equipment as their previous form.
-
-
-
14 June 2016
-
Joan updated:
-
- - The Gateway to the Celestial Derelict now takes exactly 5 minutes to successfully summon Ratvar and has 500 health, from 1000.
- - You can now actually hit people adjacent to the Gateway; only the center of the Gateway can be attacked. The Gateway is also now dense, allowing you to more easily shoot at it.
- - All Scripture in the Clockwork Slab's recital has a simple description.
-
-
Razharas updated:
-
- - Wiki now has the method of cultivating kudzu vines that was in game for over a year. https://tgstation13.org/wiki/Guide_to_hydroponics#Kudzu
-
-
kevinz000 updated:
-
- - Gravity Guns should no longer destroy local reality when set to attract and shot in an east cardinal direction. Added safety checks has slightly increased the cost of the gun's fabrication. Nanotrasen apologizes for the inconvenience.
- - Gravity guns now have an inhand sprite.
-