-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
Update submodule #9252
Merged
metalgearsloth
merged 1 commit into
space-wizards:master
from
metalgearsloth:2022-06-28-version
Jun 28, 2022
Merged
Update submodule #9252
metalgearsloth
merged 1 commit into
space-wizards:master
from
metalgearsloth:2022-06-28-version
Jun 28, 2022
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
rbertoche
pushed a commit
to rbertoche/space-station-14
that referenced
this pull request
Oct 1, 2022
* Removed duplicated audio file (space-wizards#9048) * Following bugs fix (space-wizards#8992) * Automatic changelog update * Change imagesharp on map renderer back to 1.0.4 (space-wizards#9046) * remove extended from voting pool (space-wizards#9045) * Automatic changelog update * Slow on damage fix (space-wizards#9044) * Automatic changelog update * Saltern Update 3.6 (space-wizards#9047) * raw meat poisoning rework (space-wizards#8831) * Automatic changelog update * Adds anchor checks for containment fields (space-wizards#8909) * Adds anchor checks for containment fields * norot Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Basic drug shader (space-wizards#9033) * Drunk Shader (space-wizards#8910) Co-authored-by: Kara D <[email protected]> Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Add cargo shuttle (space-wizards#8686) * Update submodule * Vending Machine Abuse (space-wizards#8863) * piece of shit i'll abuse your vending ass * placeholder * Update types.yml * threshold * Automatic changelog update * Fix compatibility mode drunk shader (space-wizards#9053) * Fix cargo pallet drawdepth (space-wizards#9057) * Automatic changelog update * Lighthouse Station (space-wizards#8650) * Don't consider power for docking (space-wizards#9054) * Automatic changelog update * Automatic changelog update * Update submodule * Displaying of player characters in the round end statistics (space-wizards#9006) * All in one * using fix * Update GameTicker.RoundFlow.cs Co-authored-by: Paul Ritter <[email protected]> * Automatic changelog update * Add department-specific radio channels (space-wizards#9061) * Add department-specific radio channels This commit adds working department-specific radio channels, while minimizing damage to the current codebase. It is expected that a future refactor will clean this up a bit. ChatSystem now has a RadioPrefix() method that recognizes department-specific channels (e.g. ":e" and ":m") in addition to the global channel (";"). It strips the prefix from the message and assigns messages an integer representing the destination channel, if any. IListen and IRadio now accept optional 'channel' arguments with this channel in mind. The ugly is that the integer channel number is hard-coded and also shows up in chat. Comms are not modeled at this time. You cannot break comms (yet). All headsets have channels soldered into them. You cannot change encryption keys to hop on new channels. Steal a headset instead. * Remove debugging print * Convert to prototypes * Use prototype names in headset prototype * Adjust list style * Document prototype fields * cringe * some cleanup * colours * Remove alphas at least * cc Co-authored-by: Kevin Zheng <[email protected]> * Automatic changelog update * Projectile spells + fireball spell (space-wizards#9058) * Projectile spells + fireball spell * say it with some gumption * Automatic changelog update * Fix ghost radios and colours (space-wizards#9064) * Automatic changelog update * Lighthouse Playable (space-wizards#9067) Co-authored-by: metalgearsloth <[email protected]> * Head specific headsets (space-wizards#9069) * Automatic changelog update * Nerf L6 (space-wizards#9063) * Automatic changelog update * Greytide Not So Worldwide (passenger specific headset) (space-wizards#9073) * Convert AME Visualizers (space-wizards#9037) Co-authored-by: TekuNut <[email protected]> * Unlocalized reagents localization (space-wizards#9041) * Cleans up the appearance and ambience of various atmos devices. (space-wizards#9071) * Automatic changelog update * EI NATH (space-wizards#9060) * EI NATH * fix gibs * figs * Node network bug (space-wizards#9039) * Fix chat bubbles in low resolution (reported by Beridot) (space-wizards#8997) * Automatic changelog update * Stop labeling draft PRs with merge conflicts (space-wizards#9089) * Fix disposal unit endless pressurizing (space-wizards#9086) * Automatic changelog update * Fire Axe [New syndie item] (space-wizards#9088) * Automatic changelog update * Barratry Update (space-wizards#9079) * Automatic changelog update * Solution spiking (space-wizards#8984) * Automatic changelog update * Jetpacks (space-wizards#9023) * Movement acceleration * tweaks * Weightless refactor coz fuck it * CCVars * weightless movement tweaks * Some cleanup while I'm here * dorkpacks * thanks fork * fixes * zoomies * toggles * hmm * yamls * b * so true * Effects refactor * namespace * review * Miasma improvements (space-wizards#9022) * Automatic changelog update * Jetpack Locker Fills and Captain Jetpack Traitor Objective (space-wizards#9102) * Infiltrator Jetpacks and N2 (space-wizards#9105) * Jetpack fixes (space-wizards#9107) * Marathon Update 2.1 (space-wizards#9108) * Cargo Shuttle Flaps (space-wizards#9109) * Saltern Update 3.7 (space-wizards#9111) * Atlas Update 1.4 (space-wizards#9104) * Roleban completions (space-wizards#9114) * Roleban completions * helpers * eat my peenor dumb robot * Update submodule * Bagel Update 13.9 (space-wizards#9106) * Override NetInterpRatio on full release (space-wizards#9093) * Rename credits to spacebucks & integrate with cargo (space-wizards#9119) * Automatic changelog update * Space Cash Sprite Tweak (space-wizards#9120) * Automatic changelog update * Fix uncooked animal protein name (space-wizards#9122) * Fixes storage eating buckled players (space-wizards#9096) Co-authored-by: Kara <[email protected]> * Automatic changelog update * Fixes counter vaulting (space-wizards#9130) * Automatic changelog update * ak and china lake sprites replacements (space-wizards#9110) Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> * Adds jetpacks to Waystation (space-wizards#9128) * Fix space ambience issues (space-wizards#8990) - Won't immediately stop ambience on grid traversal - No longer plays on station * Automatic changelog update * Lighthouse update (space-wizards#9127) * Split update (space-wizards#9125) * Fire Axe Nerf (space-wizards#9133) * Automatic changelog update * Adds a tool for importing .netset files into the ban DB. (space-wizards#9016) * Adds a tool for importing .netset files into the ban DB. * Adds a static variable so it's clear what the GUID is. * Revert "Adds a tool for importing .netset files into the ban DB. (space-wizards#9016)" (space-wizards#9149) This reverts commit b13e672. * Fix nukies (space-wizards#9159) * Quick stash * I think this does it * Quick miasma nerf (space-wizards#9161) * Evac shuttle (space-wizards#8931) Co-authored-by: metalgearsloth <[email protected]> * Update submodule (space-wizards#9165) * Atlas Evac Shuttle Compat Update (space-wizards#9166) * Bagel Evac Compat Update (space-wizards#9167) * Marathon Evac Compat Update (space-wizards#9168) * The quartermaster is now a head. (space-wizards#9163) This is literally all that had to be changed. Amazing. * Saltern Evac Compat Update (space-wizards#9169) * Fix some eshuttle stuff (space-wizards#9171) * Remove common channel from syndie headset (space-wizards#9173) * Eshuttle doors and colour (space-wizards#9175) * Fix deleted outline crash (space-wizards#9136) * Don't allow you to melee attack yourself (space-wizards#9178) There may be some situations to allow it but in actual combat if you have a big sprite like space dragon it's VERY easy to hit yourself and do sizeable damage. * Make space mobs immune to stun and knockdown (space-wizards#9176) The only time stuns are good in this game is security catching traitors, being able to 1v1 stunlock a dragon to death is kinda cringe. * Update cargodrobe.yml (space-wizards#9186) * Nerf singulo pulling (space-wizards#9181) * Fireaxe cabinet lock and fireaxe actually heavy again (space-wizards#9190) * Update fireaxe_cabinet.yml * Update fireaxe.yml * Update fireaxe.yml * updates (space-wizards#9191) * Probably fix roundend test in debug (space-wizards#9193) * Fix emergency shuttle docking causing grid overlap (space-wizards#9197) * Added a Jetpack and the Syndie Headset to the Uplink (space-wizards#9123) * Added the Jetpack and Syndie Headset to the uplink * oopsie fix * Stop radio channels from being malformed. (space-wizards#9210) * Adds cargo and escape shuttle support to Delta (space-wizards#9212) * sweeeet carolineeee. bum ba bumb. (space-wizards#9213) * Fix the UncookedAnimalProteins ReagentId for a bunch of meats (space-wizards#9170) * Update uplink_catalog.yml (space-wizards#9192) * Remove more interaction without hands (space-wizards#8946) * Remove stack splitting without hands * more no hands crap * Remove starvation damage (space-wizards#9024) * Remove starvation damage * remove more * Even more cleanup * Fix sloweddown stopping its own shutdown refresh (space-wizards#9214) * Add missing channels for mining & robotics headsets (space-wizards#9188) * Trashbag Alt Verb to dump into disposals + Cigars are tagged as trash (space-wizards#9203) * cigars are marked as trash * alt click added to trashbag disposals interaction * request changes * remove redundant check and auto refactor Co-authored-by: metalgearsloth <[email protected]> * Fixes jetpacks not shutting off on lack of fuel (space-wizards#9206) * Push * tolerance and reduced moles Co-authored-by: metalgearsloth <[email protected]> * Don't load cargo shuttle by default (space-wizards#9194) * Don't load cargo shuttle by default Realistically only I am going to care and it wastes a few seconds per test / debugging locally. * Make it a general cvar instead * a * Drop hyperspace speed (space-wizards#9216) * Disable emergency shuttles locally (space-wizards#9195) Can still re-enable via cvar but this is to make devving faster. * Fix the singularity (space-wizards#8890) * Revert "Fixes the singularity bouncing off the station. (space-wizards#8452)" This reverts commit dc186f1. * Fix singulo * Hotfix for Body Bags (space-wizards#9155) * Oops * Requested changes * Renamed * rename Co-authored-by: metalgearsloth <[email protected]> * Add files via upload (space-wizards#9201) * Adds TileNotBlocked to atmos stuff (space-wizards#8959) * Network item slots (space-wizards#9199) * Stun baton tweaks (space-wizards#9225) * Stun baton tweaks * a * sprotes * Add more instrument interaction checks (space-wizards#9223) * Update traitorObjectives..yml (space-wizards#9231) * Adds the Central Command outpost for Roundend and ERT to spawn at. (space-wizards#9146) * Adds Reach II * Updated Reach II to work after refactor * removing old map * Adding the Central Command outpost * Reachii isn't meant to be in here at all. * updated possible error in .yml * updating .yml * Updated CentComm, fixed some issues like lighting. * Imagine if we also docked at centcomm * a Co-authored-by: metalgearsloth <[email protected]> * Place tanks in cargo shuttle (space-wizards#9233) they didn't need to be in crates. * Lighthouse and Waystation posters (space-wizards#9141) * Bump cuff times (space-wizards#9227) * SMG crate magazines fix for Wt550 (space-wizards#9237) * Crates can go under plastic flaps (space-wizards#9236) needed to be SmallMobMask in order to fit under doors * Give lawyer sec headset (space-wizards#9205) * Add mintemp to meth reaction (space-wizards#9234) * Puddle slippery again! (space-wizards#8899) * f * blood * Revert "f" This reverts commit 7a83751. * Revert "blood" This reverts commit d6510f4. * normal fix * Make centcomm unvotable (space-wizards#9239) * Remove plants with no utility from common sources (space-wizards#9235) * Remove plants with no utility from common sources * review * Adjust alert level volumes (space-wizards#9145) * Finally * Requested adjustments * webedit so that people can execute the RemoteExecCommand. (space-wizards#9242) * Syndicate Shoulder Holster and the Outlaw's Hat (space-wizards#9147) * Syndie Holster sprite * Outlaw Hat sprite * Outlaw Hat entity * Syndie Shoulder Holster entity * Tweaked sussy toolbox * Tweaked Syndie Holster * Outlaw Hat and Syndie Holster to the Uplink * it was a misinput, calm down * Tweaked holster so it can only hold weapons * and ammo too * fixing conflicts... from my OWN PR.... * Fixed another conlfict * fix * Thieving component and Thieving Gloves (space-wizards#9158) * Thieving component and gloves * Fixes popup issue * Forgot to add it for hands * Adds a bool datafield * Comments * Requested changes * Make Inflatable doors transparent (space-wizards#9243) * Update inflatable_wall.yml * Update inflatable_wall.yml * Hand made pistol replacement and inhands for ak and china lake (space-wizards#9198) * hand made pistol replacement and inhands for ak and china lake * china lake inhands correction * change Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> * Forensics (space-wizards#8451) * Port forensics from nyanotrasen * port updates * printing * Update Resources/Locale/en-US/forensics/forensics.ftl Co-authored-by: Veritius <[email protected]> * Update Content.Server/Forensics/Components/ForensicPadComponent.cs Co-authored-by: Kara <[email protected]> * Update Content.Server/Forensics/Systems/ForensicPadSystem.cs Co-authored-by: Kara <[email protected]> * Update Content.Server/Forensics/Systems/ForensicScannerSystem.cs Co-authored-by: Kara <[email protected]> * partially address reviews * comments * redo the events * handle it * rewrite loc * master fixes Co-authored-by: ike709 <[email protected]> Co-authored-by: Veritius <[email protected]> Co-authored-by: Kara <[email protected]> * Add files via upload (space-wizards#9202) * Update submodule (space-wizards#9248) * Bandaid awakebodies for tilefriction (space-wizards#9249) * Completions for fixgridatmos (space-wizards#8983) * Completions for fixgridatmos * Fix stuff Co-authored-by: metalgearsloth <[email protected]> * Potted Plants Cleanup (space-wizards#9196) * pray for me * yippee * collision fix * Add door prying to xenos (space-wizards#8917) * Add door prying to xenos * a * c * dart ert fix (space-wizards#8958) Co-authored-by: metalgearsloth <[email protected]> * ECS and bandaid research (space-wizards#9251) * Localize jobs (space-wizards#8968) * Localize job supervisors * Rename supervisors file * Localize job names * Remove localization for fallback job name * Use LocalizedName for Job * Fix job names case * Remove implicit GridId conversions (space-wizards#8975) * Update submodule (space-wizards#9252) * Salvage Locker Balance / Changes (space-wizards#8839) * added items and added probability to more items * increased pickaxe probability. Made Spatio suit guaranteed * removed pickaxe and ore bag * removed laser gun. rip * Fix master merge (space-wizards#9254) * Pillar update (space-wizards#9126) Co-authored-by: metalgearsloth <[email protected]> * Revert "Pillar update (space-wizards#9126)" (space-wizards#9255) * Port research disks from nyano (space-wizards#9081) Co-authored-by: metalgearsloth <[email protected]> * OH NO THE SERVER IS DYING (space-wizards#9259) Fix a typo that hangs the server. * Remove BreathMask component from sterile masks (space-wizards#9257) * Misc state handling changes (space-wizards#9265) * misc state handling changes * ambient dirtying * Fix radio/chat error (space-wizards#9264) * Localize ETA units (space-wizards#9267) * Update submodule (space-wizards#9270) * Detach to null & icon smoothing (space-wizards#9268) * Fixes the external airlocks on Waystation (space-wizards#9269) * Localize radio channel names (space-wizards#9256) * Add localized channel names * Full names * Include text search in admin logs db query (space-wizards#9274) * Fix duplicate logs when skipping before filtering (space-wizards#9275) * Add shown/visible counter to admin logs control (space-wizards#9276) * Disable admin logs next button when there are no more logs (space-wizards#9277) * Buff cuff times again (space-wizards#9279) * Update submodule (space-wizards#9280) No one reads this unless it's in #github * Check smokable is in mouth (space-wizards#9281) * Clarify EORG (space-wizards#9282) * Fix radio localisation (space-wizards#9283) * Log kitchen spikings (space-wizards#9284) Easier to find. * Don't play empty gun sounds (space-wizards#9286) * 1 more radio loc (space-wizards#9287) Woops * Make large explosions use approximate lookups (space-wizards#9296) * Update lighthouse.yml (space-wizards#9300) * Add action to pull down mask (space-wizards#9015) * Add action to pull down mask * Update based on review comments * fix access * cleanup * Update based on review comments * revert change to ToggleableClothingSystem * switch to unequip * Specify the unequip is for togglemaskevent only * fix issue of activating mask in hands with something else in mask slot * Update based on review comments * switch to dependency for ActionSystem for consistency * whoops other instance too * review changes * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Update submodule (space-wizards#9305) * Fireaxe Structure Damage (space-wizards#9289) * Entities with hands still respect "needsHands: false" for Puller (space-wizards#9266) * Makes the Pointless tab not pointless (space-wizards#9310) * Add exception tolerance to explosion processing (space-wizards#9309) * Automatic changelog update * Split QoL Update (space-wizards#9303) * Automatic changelog update * Minor rules tweaks/clarifications (space-wizards#9304) * Automatic changelog update * Gimps the restart vote. (space-wizards#9327) * Disables the restart vote when admins are online. * Gimps the restart vote so it requires 85% agreement. * address rebiew * Automatic changelog update * Update gitignoure Co-authored-by: Júlio César Ueti <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: wrexbe <[email protected]> Co-authored-by: EmoGarbage404 <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: OldDanceJacket <[email protected]> Co-authored-by: KIBORG04 <[email protected]> Co-authored-by: Paul Ritter <[email protected]> Co-authored-by: Kevin Zheng <[email protected]> Co-authored-by: TekuNut <[email protected]> Co-authored-by: TekuNut <[email protected]> Co-authored-by: lapatison <[email protected]> Co-authored-by: Vera Aguilera Puerto <[email protected]> Co-authored-by: 20kdc <[email protected]> Co-authored-by: ike709 <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Flipp Syder <[email protected]> Co-authored-by: Peptide90 <[email protected]> Co-authored-by: TaralGit <[email protected]> Co-authored-by: and_a <and_a@DESKTOP-RJENGIR> Co-authored-by: TimrodDX <[email protected]> Co-authored-by: Moony <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Ablankmann <[email protected]> Co-authored-by: Greenrock64 <[email protected]> Co-authored-by: Jessica M <[email protected]> Co-authored-by: Morber <[email protected]> Co-authored-by: Profane McBane <[email protected]> Co-authored-by: LittleBuilderJane <[email protected]> Co-authored-by: ike709 <[email protected]> Co-authored-by: Veritius <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: ZeroDayDaemon <[email protected]>
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.
weh