reverts the HFR fusion #5
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sen each round (tgstation#56309) This PR adds station traits which are essentially small changes to a normal round that can be used to create small variations in how a round might play out, sometimes there might be only one, very simple trait, but you might have a round where they have a somewhat bigger impact, to make rounds feel slightly more different from each other. The following traits have been added: Positive: Lucky winner - Free pizza and beer every 6-12 minutes Galactic Grant - Larger starting funds for cargo Premium internals boxes - emergency box has flare + radio as bonus Bountiful bounties - Bounties pay 20% more Strong supply lines - Imports 20% cheaper Filled maint - More loot in maint Fast shuttle - Cargo shuttle is faster Free scarves - Free scarfs if a slot is free Neutral: Bananium shipment - Clown starts with 5 sheets of bananium (Neutral because this helps noone but the clown) Unnatural atmosphere - Lava planet can get more restricted gasses Unique AI - Random lawset at roundstart for AI Ian adventure - Ian teleports to a random spot on the station Glitched PDAs - PDA's have a different beep Announcer intern - Changes the announcement messages to sound like they're from an intern at Centcom Negative: Carp infestation - Carp event is more common and can start earlier Weak supply lines - Imports 20% more expensive Blackout - Station lights are partially broken around the station Empty maint - Less loot in maint Overflow bureacracy mistake - Random overflow job (From a vetted list) Late Arrivals - Everyone starts in arrivals Random spawns - Random spawn location (by drop pod) Slow shuttle - Cargo shuttle is slower Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com> Co-authored-by: coiax <yellowbounder@gmail.com>
Station trait pog
Wing sprites are courtesy of Papaporo Paprito over on Fulpstation! This PR adds a second sprite for flight potion wings for moths. A new system is implemented to make this possible, using radial menus.
Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: coiax <yellowbounder@gmail.com> Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
About The Pull Request Dynamic 2021, among much other things, splits the threat level into two separate budgets, one for round start and one for midround/latejoin. You can read the design doc, plus methodology and charts here: https://hackmd.io/@tgstation/S1C4dYJkO. To server owners: this is incompatible with current dynamic.json configurations. This is not just because some fields have different values now, but because the older values are not balanced towards this system. Inidividual list of changes (as I remember them): Threat level is now split into two separate budgets, one for round start and one for midround/latejoin. In TESTING, you can now run dynamic simulations to see the roundstart picks. antag_cap is now based on an equation rather than a fixed list of antags per indice--the old system is not scalable. You can now pass it either a number for a fixed constant, or a list with "denominator" and an optional "offset" to fit the equation ceil(x / denominator) + offset, with x being population. Midround/latejoin timers are now vars on /datum/game_mode/dynamic itself, and thus can be configured by head admins per server. Removes some older, as far as I can tell completely unused admin tools relating to dynamic. autotraitor_cooldown is now properly respected from config, and is based on an exact time rather than on ticks (450 used to be 15 minutes, now it's just 15 MINUTES). The rulesets dynamic chooses are now in a dynamic.json file in round logs. Relies on tgstation/tgstation13.org#64 to be public. Adds more logging to the autotraitor ruleset for admins. Midround/latejoin chance modifiers are now configurable. Labelled "Do Not Merge", as the design doc outlines the specific playtesting schedule I would like to perform. Note to self: Remove the custom MOTD before merge. Why It's Good For The Game (Copied from design doc) Dynamic currently dumps as much threat as it can into round start threats. This means that rounds at ~50 threat can have an absurd amount of antagonists round start, while leaving very little threat for midround/latejoin antagonists. What inevitably happens is just one of those picked decides to murderbone, leading to the inevitable 20 minute shuttle call. Furthermore, once those antagonists are dead, Dynamic doesn’t have any threat left to spend on new antagonists that keep the round flowing, promoting the mentality of “antags dead, I’m bored, let’s leave”. The proposed solution of Dynamic 2021 is to split threat level into two separate budgets, one for round start and one for midround/latejoin. This split, like threat level, will also be done on a lorentz curve–meaning that while most rounds will have them evenly split, there is still the possibility of chaotic high antagonist round start rounds, or the possibility of a midround onslaught.
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
There is apparently some confusion where people were under the impression that the gate allows gas to move bidirectionally once open.
- Makes it so warning for time happens based on the time and not when the tape recorder hears something - Makes stopping work correctly when we try to record with a full tape or when recording stops because of a full tape - Uses the SECONDS and MINUTES defines instead of a mixture of undefined deciseconds and seconds that are multiplied by 10 (while having to divide by 10 in a couple of places) - Cannot print a transcript for a blank tape - Tweaks transcript name setting to be better formatted - No longer update_icon() after stop() under play() (it's in the stop() proc) - Reorders stopping to be consistent between playing and recording and logical (which probably makes no noticeable difference) - Play/record hiss sound loop (mediocre due to lack of options in sound loops to cut and not fade in/out) - Drop and pick up sounds - 0→2 throwforce (like it was when Uhangi added them, before Hornygranny made it 0 for some reason) - Cleans up radial image() usage - Clarifies radial icon var - Clarifies tape unspooling and respooling vars - Random 3 char hexademical on tape names - Tape can spawn on either side - Adds greyscale tapes and randomised colouration
…ta (tgstation#56550) Robotics can now properly use their maintenance on Meta Removed an active turf in science solars
…own overflow (tgstation#56575) Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
…of refactors, some documentation, and other niceities (tgstation#56199)
) Fully upgraded autolathes can for whatever reason have a material multiplier of less than 1, causing it to be able to create (some) items with less material than they recycle for (while using a fully upgraded recycler). Now it cant. The material multiplier for autolathes is now 1.6 -> 1.4 -> 1.2 -> 1 per tier of manipulator inside it with t4 having 1 efficiency. So no more exploit memes Fixes tgstation#56444 Fixes tgstation#52852 Fixes tgstation#49589
…ew traits, new genes, and more!) (tgstation#56024)
…nts, 4 new traits, new genes, and more!) (tgstation#56024)" This reverts commit fdf876f.
…ew traits, new genes, and more!) (tgstation#56024)
## About The Pull Request Fixes some minor issues involving a few atmospheric machines on KiloStation. An air alarm that is floating in the air has had its pixel Y value changed. All maint gas flow meters have been moved to layer four or two so they are actually functional now. I've added additional gas flow meters nearby to two layer 4 meters so there is monitoring for most the distribution and scrubbing networks in areas where there was originally only one gas flow meter. ## Why It's Good For The Game For the air alarm and re-layered gas flow meters these are map issues and fixing issues is always good for the game. For the 2 additional gas flow meters I made these based on the fact that Kilo had two gas flow in medbay maint, one of which I set to layer 2. For consistency I've added an additional meter to all maint gas flow meters on the scrubbing network, the maintenance atmospheric connectors are excluded.
…ability (tgstation#56894) - The portable chem mixer now displays pH-values - It can now dispense 1u of reagents, so buffer solutions can be added carefully - It can now be loaded with bottles, plastic bottles and condiment bottles (all bottle types that the chem masters/chemistry can make). Beakers also still work of course. - CTRL+click opens and closes it to switch between filling mode (inventory in which you place beakers and bottles) and dispensing mode (UI in which you dispense to a container) - When worn on the belt and in filling mode, a left click opens its inventory. No more dragging or alt-clicking needed to open it. (alt-clicking to swap beakers in dispense mode still works, just like the normal dispensers) - The UI has been resized to, in its default state, make it easier to visually skim through the chemicals in the list
Adds back hearts removed by tgstation#56897, but in a way that doesn't completely murder timers. Also made the code a bit better. Here you can see it on my hideous date. https://user-images.githubusercontent.com/35135081/107848333-6ec06280-6da7-11eb-91b6-1382380eb3b4.mp4
…n#56754) * Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.
…d on their current charge level (tgstation#56844)
…tion#56772) Co-authored-by: Cosmo <cosmo.rader@yandex.com>
N2O at the moment is very very tight on it's explosive window, so it has a high chance to blow up a chemist who isn't ready to crash their temp as soon as it starts. This reduces the temperature spike so it's less dangerous and will always resolve without an explosion if the temperature is crept up. In addition; if the reaction has 30% or less purity, part of the N2O will convert to gas.
Now that necropolis crates require bone keys to open, the Arena Shuttle will give any survivors from the arena a bone key to open a crate with.
…havior changes included. (tgstation#55551) Converts the effects of the nightmares light eater into a component and a couple elements Adds some flavor text to the light eater Makes the effects of the nightmare's light eater dispel if the armblade is destroyed Probably a net increase in code quality More flavortext The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade
tgstation#56888) Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
…tgstation#56939) My finger slipped and now these reagents have the equivalent of can_synth = TRUE so uh that may not be very good
This reverts commit a9f07dc.
Acensti
pushed a commit
that referenced
this pull request
Dec 26, 2021
* cool map bro! * security * perma * secfull * secman * medstart * engine2 * atmos start * barrrr * bar2 * bar3 * civil * lower * barrrr * barrrrrr * start * cargo * sci * j * servicedecal * civildecal2 * service decal2 * service decal 3 * service decal 4 * pip * decal4 * decal8 * arse! * arrivals * arrivals 2 * ai * aifix * vault+techstorage * medbay * bridge 1 * sec 3 * sectest * squish squish * securitywork * secmore * config setup * tram * cargo work * escape * disposalfuck * i hate pipes * disposalsfull * SEC * grav * bads * researchwip * caw * hguhwhuh?? * apc+air_alarm * engie * sm * stttt * aisat * areas * camera wip * camera 2 * secam * shuttle shit or something idk * aaaa * path nodes + waypoint navs * almost there * pull * unnecessary file * standardize * tram choo choo!!! * tgm * testmerge feedback fixes * map work * test * test2 * i hate * THERE * trams without pulling upstream like an idiot (#3) TRAM * fast tram fast TRAM * fuck turfs * tram collisions, tram cooldowns (#4) lol * ass * tram but real * forgot the , * code improvements, fixes, and tram call buttons (#5) * unnecessary check gone, nulls now scrubbed (#6) * fancy tram * feedback changes * AT fix * feedback changes * incin+engine atmos wooo! * missing grav gen cable * more feedback changes + diagonal shuttle wall * bottom floor explodes into airless asteroid instead of space now * even more feedback changes * area change * update to iron sheets * ore smelter wrong dirs * path changes agagagagaga * no more fabs * atmos fixes + more general fixes * Creates SStramprocess and Makes Movement Use That Instead of Timers (#7) * makes SStramprocess a child of SSprocess and makes tram obj use it * gets rid of continue_movement() in favor of SStramprocess * remove fake tram * tgm baby * maintenance update + chode tram * hopefully makes the tram choke the server out less (#9) tries to put brakes on the tram * bad id console * more maint stuff * Big bundle of fixes and additions for trams (#10) * BANG TING OW * fixes docs, makes everyone always take damage, fixes bump text and span * control prevention... maybe? * combat mode no longer triggers trams * tram conflicts + tram console * medical changes + tram lift console * bot pathing in tunnels * tram whiteship + bad area string fix * -station fixes -tram monorail -tram monorail grinding + achievement * trail these noots * rail * yee * diner bots + xeno changes * Tram TGUI FINALLY (#11) * bflehgfwblilbrga * Update TramControl.js * --fix, --lint * more ui * brokendimmer now doesn't try to load content, static data updates, MORE sanity. * finishing off tram sprites * cleaning up dmis * Portal Improv * re-removes icons * relay moved, map fix * fixed? (#12) * rd machines * relay moved, upload moved to sci, service lathe access, typo * maint stuff * tgm * medical overhaul, more maint junk * comments out achievements for testing * space hole + spare * actual tram blender fix according to known blender method * tgm * trail these * removes depreciated tram content + accidental changes during pulling Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com> Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Acensti
pushed a commit
that referenced
this pull request
Dec 27, 2021
* cool map bro! * security * perma * secfull * secman * medstart * engine2 * atmos start * barrrr * bar2 * bar3 * civil * lower * barrrr * barrrrrr * start * cargo * sci * j * servicedecal * civildecal2 * service decal2 * service decal 3 * service decal 4 * pip * decal4 * decal8 * arse! * arrivals * arrivals 2 * ai * aifix * vault+techstorage * medbay * bridge 1 * sec 3 * sectest * squish squish * securitywork * secmore * config setup * tram * cargo work * escape * disposalfuck * i hate pipes * disposalsfull * SEC * grav * bads * researchwip * caw * hguhwhuh?? * apc+air_alarm * engie * sm * stttt * aisat * areas * camera wip * camera 2 * secam * shuttle shit or something idk * aaaa * path nodes + waypoint navs * almost there * pull * unnecessary file * standardize * tram choo choo!!! * tgm * testmerge feedback fixes * map work * test * test2 * i hate * THERE * trams without pulling upstream like an idiot (#3) TRAM * fast tram fast TRAM * fuck turfs * tram collisions, tram cooldowns (#4) lol * ass * tram but real * forgot the , * code improvements, fixes, and tram call buttons (#5) * unnecessary check gone, nulls now scrubbed (#6) * fancy tram * feedback changes * AT fix * feedback changes * incin+engine atmos wooo! * missing grav gen cable * more feedback changes + diagonal shuttle wall * bottom floor explodes into airless asteroid instead of space now * even more feedback changes * area change * update to iron sheets * ore smelter wrong dirs * path changes agagagagaga * no more fabs * atmos fixes + more general fixes * Creates SStramprocess and Makes Movement Use That Instead of Timers (#7) * makes SStramprocess a child of SSprocess and makes tram obj use it * gets rid of continue_movement() in favor of SStramprocess * remove fake tram * tgm baby * maintenance update + chode tram * hopefully makes the tram choke the server out less (#9) tries to put brakes on the tram * bad id console * more maint stuff * Big bundle of fixes and additions for trams (#10) * BANG TING OW * fixes docs, makes everyone always take damage, fixes bump text and span * control prevention... maybe? * combat mode no longer triggers trams * tram conflicts + tram console * medical changes + tram lift console * bot pathing in tunnels * tram whiteship + bad area string fix * -station fixes -tram monorail -tram monorail grinding + achievement * trail these noots * rail * yee * diner bots + xeno changes * Tram TGUI FINALLY (#11) * bflehgfwblilbrga * Update TramControl.js * --fix, --lint * more ui * brokendimmer now doesn't try to load content, static data updates, MORE sanity. * finishing off tram sprites * cleaning up dmis * Portal Improv * re-removes icons * relay moved, map fix * fixed? (#12) * rd machines * relay moved, upload moved to sci, service lathe access, typo * maint stuff * tgm * medical overhaul, more maint junk * comments out achievements for testing * space hole + spare * actual tram blender fix according to known blender method * tgm * trail these * removes depreciated tram content + accidental changes during pulling Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com> Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
f