Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master fixin #37

Merged
merged 67 commits into from
Sep 11, 2024
Merged

Master fixin #37

merged 67 commits into from
Sep 11, 2024

Conversation

KeldWolf
Copy link

Upstream for reals this time. Also trying to fix publish still. Everything is merged from space-wizards.

PJB3005 and others added 30 commits September 9, 2024 20:10
…wizards#31496)

* Extend shuttle dock time if the shuttle doesn't dock at evac.

If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station.

Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody.

To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios.

The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations.

Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it.

* Minor review

---------
* Revert "make cables more visible"

This reverts commit b2defdf.

* offset cable sprite

* :-)

* one more pixel for mv
* Adds entities, sprites, and loadout accessibility

* Fixing Uniform file issues
* spawn dragon rule at station edge

* 2

* stuff

* fix round end summary not showing

* no invalid euid
several surv camera related fixes

Co-authored-by: YourUsername <you@example.com>
…ds#31978)

* uhhh a lot of window stuff, mainly easy upgrades

* buff plasma/uranium rwindows so you actually want them

* fix uranium number, correct construction descriptions

* fix tinted window price

* frosted windo
…ards#29565)

* Nuke Now Requires the Disk to be Inserted to Toggle Anchor

* message stating you need the disk to toggle floor bolts
…wizards#31739)

* Properly credit contributors who were truncated by GitHub's 500 email limit

* update list oops forgot my origin was so out of date

* another
* clean up electronics lathe recipes

* result

* make door and firelock cheap

* engin

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix some contraband issues

* Flaming fire axe to Syndie contraband

* Add Central Command department and contraband group

* Restricted encryption keys

* ERT gas mask

* Thieving beacon

* Bladed flatcaps

* Advanced circular saw and thief toolbox

* Acolyte armor

* Magazines and cartridges

* SMG magazines

* Grenades

* Mercenary clothing and combat gloves

* ERT, Deathsquad and Central Command Official items

* Update

* Who the fuck putted ERT into fun?!

* Fix

* Yeah

* I forgot
* Add draft saving to news consoles

* fix after bui changes

* comments + rename vars

* no
* Special latejoin message for captain

* fix gender in locale

* remove this for now

* shame

* not really shame

* change

* do that
ScarKy0 and others added 23 commits September 10, 2024 13:08
* Comment out gastank explosion trigger

* CVAR creation

* Blank line between method + toml update

* I fucking hate VistualStudio

* change bool logic into float

* cat dancing.gif

* Adjust some minor nits

* Update Content.Server/Atmos/EntitySystems/GasTankSystem.cs

Co-authored-by: Partmedia <kevinz5000@gmail.com>

* Un-hardcode unused initial cached CVar value

* Update Resources/ConfigPresets/WizardsDen/wizardsDen.toml

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fix: Check revenant ability costs correctly

* refactor: Idiomatically get negative value
* Adds salvage magnet board to lathe as default recipe, changes board sprite to supply sprite

* Adds the salvage magnet board to the QM's locker, science cannot be trusted and never should be

* my body is a machine that turns commits pushed to the wrong branch into machinations on git

---------

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Delete antagonist shuttles.

* Remove neutral shuttles.
…gs + honkbot slipping 2 (space-wizards#31011)

* Lets do this again

* I noticed this way to late
Add "X.A.N.A." as an AI

Anyways I don't think we're gonna get sued for trademark infringement of an old dead French TV show yeah?
Re-added Crimson's Changes

Signed-off-by: Kelderan <66748890+KeldWolf@users.noreply.github.com>
@KeldWolf KeldWolf merged commit 821909c into master Sep 11, 2024
11 of 12 checks passed
@KeldWolf KeldWolf deleted the masterFixin branch September 12, 2024 02:02
@FluffMe FluffMe added the Maintenance Maintainer PR for upstream merges, changelog updates, etc. label Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Changes: Sprites Changes: UI Maintenance Maintainer PR for upstream merges, changelog updates, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.