Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
DrSmugleaf
c05a458de2
Revert "Game server api ( #23129 )" ( #23672 )
...
This reverts commit dfc8ea6aee
2024-01-07 02:04:21 -08:00
Simon
dfc8ea6aee
Game server api ( #23129 )
...
* Stuff
* Fix RoundStatus Action
* Rename stuff
* Also needs to run on the main thread
* minor stuff
* Move to not be an EntitySystem
* Part 1 of making this less shit
* Make some more stuff run on main thread
* Actor check, logging and remove token from log.
* Better log
* Change ActionKick to use Guid instead of username
* Fix build
* Bandaid fix for test fails
2024-01-06 17:47:29 -08:00
Vigers Ray
5492cc5fd1
Login tips ( #22234 )
...
* Init coomit
* meh
* okay
* Revert "okay"
This reverts commit bb638aa4baa8dbd0e285c3435aabf83171a4806a.
* enable-d
* Update Content.Client/Launcher/LauncherConnectingGui.xaml.cs
Co-authored-by: Kara <lunarautomaton6@gmail.com>
* review
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-06 17:06:49 +11:00
LankLTE
4c179d69e7
add secret weight prototype cvar ( #23564 )
...
Add cvar
2024-01-05 18:30:00 -05:00
Morb0
8a0a435965
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
2024-01-05 00:55:19 +03:00
LankLTE
01082c6c27
Add cvar to show new players in ahelp ( #23265 )
...
* Implement cvar
* Enable cvar on Wizden
2024-01-04 15:45:23 +11:00
metalgearsloth
bf79acd127
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
2024-01-04 14:25:32 +11:00
Morb0
fd12440582
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/Species/slime.yml
# Resources/Textures/Interface/Actions/meta.json
# Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
# Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json
# Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-03 13:37:55 +03:00
Chief-Engineer
7ecd7668a1
Enable panic bunker by default ( #23252 )
...
* update cvars
* vote 1984
* rip
* add custom reason
* make panic_bunker.enabled a server cvar
I am kind of guessing
---------
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2024-01-03 03:26:13 -06:00
deathride58
aa6645c8e9
Blindness rework - damaged eyes are now a stylized simulation of legal blindness ( #23212 )
...
* blindness rework - damaged eyes now simulate legal blindness
* hEY THATS FOR DEMONSTRATION PURPOSES ONLY AAA
* attributions
* makes eyeclosecomponent adminbus compatible
* useshader(null)
2024-01-03 01:07:02 -08:00
Morb0
f062cbcec2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
# Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-02 23:07:58 +03:00
Kara
f9355c6151
Remove ambient sound from lv/mv/pipes + up default ambience volume ( #22536 )
...
* Remove remaining ambientsound enabled overrides on maps
* Disable LV and MV ambience altogether
* hv enable default
* not necessary bc subfloor
* up default volume
* no pipe ambience
* pepis
2023-12-31 23:57:33 -08:00
LankLTE
e76d8390bd
add cvar for custom panic bunker reason ( #23267 )
...
Panic bunker cvar
2023-12-31 21:53:49 -05:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
metalgearsloth
4023134cf0
Add UI click sounds ( #22410 )
...
* Add UI click sounds
* tweaks
* Significant cleanup
* Audio options and numerous fixes
* Fix the remaining UI elements
* new click sound
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-12-29 15:43:36 +11:00
Morb0
918f543c2c
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
2023-12-25 21:03:49 +03:00
LankLTE
82ddf451e6
change the restart vote to have no effect with admins online ( #22945 )
...
* Change the vote and cvar
* Only denies successful votes
* Add comments because I'm a good coder, I swear
* I added a space to the first line of ccvars it's so over
2023-12-24 23:55:56 -08:00
Morb0
e3f6082c58
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
# Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
# Tools/actions_changelogs_since_last_run.py
2023-12-21 03:03:30 +03:00
Simon
dc017dd6fa
CVar for custom name in client-side ahelp menu. ( #22069 )
...
* the grinch will ruin christmas
* comments here, comments there, comments should not be a thing :godo:
* Unsubscribe from CVar
* rename cvar to be clearer.
* Change switch to if statement.
2023-12-19 17:40:37 -06:00
Morb0
8363a22e11
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Tools/actions_changelogs_since_last_run.py
2023-12-18 01:51:30 +03:00
deltanedas
cce7aa777c
start of persistence support ( #20770 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 19:55:19 -08:00
Morb0
7d4b894002
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
2023-12-16 03:05:40 +03:00
Kara
e4a227ff0d
Explosion SFX juicing + higher persistence ( #22544 )
2023-12-16 03:57:46 +11:00
LankLTE
94628d6ab1
Relay custom votes to a webhook ( #18561 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-12-14 20:03:32 -08:00
Kevin Zheng
24629ad487
Fix heat capacity scaling ( #22464 )
...
* Correctly apply HeatScale
* Apply HeatScale on InitializeGases()
* Re-add conservative heat scaling and speedup
2023-12-13 21:38:58 -05:00
Morb0
33942c412a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
# Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
DrSmugleaf
77e872fe8b
Add ahelp bwoink sound cvar ( #22439 )
2023-12-13 01:51:30 -07:00
Kevin Zheng
454eb5307f
Turn off speedup and heat scaling to isolate bug ( #22405 )
2023-12-12 03:03:01 -07:00
Morb0
f22b645ff6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
2023-12-12 11:00:46 +03:00
Kevin Zheng
405e569cd5
Split up atmos speedup from heat scaling ( #22372 )
2023-12-12 00:49:20 -07:00
Kevin Zheng
a2ed25ad03
Add atmos time compression ( #21954 )
...
Add atmos.speedup which is effectively a atmos-only time compression
CVar. This adjusts heat capacities and transfer rates to effectively
globally speed up the time constants of atmos.
This allows faster response to heating/cooling changes and faster
cleanups (by buffing scrubbers, pumps, and everything else) that is
tunable through one global time compression CVar.
It also achieves this without any thermodynamic unsoundness.
2023-12-11 15:59:47 -08:00
Flareguy
a69c5e3742
Document why tile ripping was disabled upstream ( #22315 )
2023-12-11 11:45:26 -08:00
Morb0
29a7082223
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
metalgearsloth
02c8e585f7
Turn arrivals into a planetmap ( #21777 )
2023-12-11 20:34:19 +11:00
Pieter-Jan Briers
46e36934a6
High-latency DB testing stuff ( #22282 )
2023-12-10 16:30:12 +01:00
Morb0
6b2c649308
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Textures/Tiles/attributions.yml
2023-12-10 10:43:49 +03:00
metalgearsloth
98d5f9f56b
Make audio sliders use gain not volume ( #21984 )
2023-12-09 14:03:08 +11:00
Morb0
caf8ac8005
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Nemanja
9ca84ac3fb
Grid inventory fixes ( #22161 )
...
* Gridinv fixes
* eek
* oh yeah this too
* eek
2023-12-05 16:38:10 -07:00
Arthur Asimov
3da699ad32
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
2023-12-05 07:42:45 +03:00
deathride58
e32ede5882
Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! ( #21999 )
2023-12-04 16:10:49 -07:00
Nemanja
cc8984d096
Grid Inventory ( #21931 )
...
* Grid Inventory
* oh boy we keep cracking on
* auto insertion is kinda working? gross, too!
* pieces and proper layouts
* fix the sprites
* mousing over grid pieces... finally
* dragging deez nuts all over the screen
* eek!
* dragging is 90% less horrendous
* auto-rotating
* flatten
* Rotation at last
* fix rotation and change keybind for removing items.
* rebinding and keybinding
* wow! look at that! configurable with a button! cool!
* dragging is a bit cooler, eh?
* hover insert, my beloved
* add some grids for storage, fix 1x1 storages, fix multiple inputs at once
* el navigation
* oh yeah some stuff i forgor
* more fixes and QOL stuff
* the griddening
* the last of it (yippee)
* sloth review :)
2023-12-04 16:04:39 -07:00
Arthur Asimov
f8d4eea0dc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Maps/core.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
metalgearsloth
783879921b
Disable artifact spam on roundend ( #21970 )
...
* Disable artifact spam on roundend
I think part of the issue was the enormous amount of logspam but at any rate this turns it off.
* Also this
* And these
2023-11-28 22:39:16 -05:00
Flareguy
c7f4294d73
disables space wind and tile ripping cvars ( #21847 )
2023-11-27 14:42:29 -07:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
Pieter-Jan Briers
8bf807a9b5
Basic rate limiting for chat messages ( #21907 )
2023-11-27 14:08:30 +11:00
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
metalgearsloth
5cbf935cf0
Wrap gateway generator in cvar for dev ( #21758 )
2023-11-21 21:36:38 -07:00
