Morbo
3f14ebc180
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
2022-12-19 11:00:05 +03:00
metalgearsloth
ab68d300f7
Multi-viewport popups ( #11591 )
2022-12-19 13:39:35 +11:00
Pieter-Jan Briers
4bfc644a03
Fix stack overflow in FlashOverlay dispose. ( #13082 )
2022-12-19 13:06:16 +11:00
Kevin Zheng
72e1a5e109
Fix in-game voting ( #12932 )
...
* Fix in-game voting
* Add comment
* Re-enable vote.restart_enabled by default
2022-12-19 02:13:37 +01:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Leon Friedrich
decce17e94
Fix decal state exceptions ( #13075 )
2022-12-19 07:44:14 +11:00
metalgearsloth
b6a59051dd
Fix click sorting ( #11657 )
2022-12-19 06:41:04 +11:00
Leon Friedrich
8f352f87c2
Decal state handling ( #12624 )
2022-12-19 06:28:46 +11:00
Leon Friedrich
2759ef009e
Gas tile overlay state handling changes ( #12691 )
2022-12-19 06:25:27 +11:00
Nemanja
195bf86fe2
PlantholderComponent ECS ( #12871 )
2022-12-18 10:12:28 -08:00
metalgearsloth
d50517b225
Fix gravity shenanigans ( #12866 )
2022-12-18 16:03:23 +11:00
AJCM-git
2af8ada799
ECS Buckle and Rotation visualizers ( #13024 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-15 19:39:34 +01:00
Morbo
e32c928ff8
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Datasets/Names/last.yml
2022-12-15 18:30:38 +03:00
Morb
07b5ba7002
Hotfix Inject DI to queue GUI ( #646 )
2022-12-15 07:27:26 -08:00
Leon Friedrich
6fa2391e42
Replaces anchored lookup flag with static ( #13036 )
2022-12-15 15:29:46 +11:00
Morb
57459b64b1
Disable priority join button ( #644 )
2022-12-14 14:08:01 -08:00
Morb
7bfeb45102
Remove priority join button ( #643 )
2022-12-14 00:58:09 -08:00
Leon Friedrich
f65510ca81
misc flare fixes ( #12942 )
2022-12-13 14:46:58 -06:00
Morbo
f0cf42aab3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/pillar.yml
2022-12-12 18:59:08 +03:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +11:00
Leon Friedrich
77683a95df
Add point light to burning entities ( #12959 )
2022-12-12 14:35:33 +11:00
metalgearsloth
7910bd3ff4
Context steering for NPCs ( #12915 )
2022-12-12 14:33:43 +11:00
Morb
dbba104eab
Fax Machine ( #11704 )
2022-12-12 05:06:11 +11:00
metalgearsloth
748b79d1df
Fix duplicate mech footstep sounds ( #12972 )
...
* Fix duplicate mech footstep sounds
We just add a new component for relay targets so we can use that for audio prediction.
* Fix cwash
* woop
2022-12-11 07:18:25 -06:00
Morbo
024f4113a9
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-11 07:59:37 +03:00
Paul Ritter
5715b0c2be
Changes needed for new notnullableflaganalyzer ( #12957 )
2022-12-11 00:19:37 +01:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Nemanja
913e1ee676
Exosuit: Ripley ( #12668 )
...
* mechs
* interaction relay
* atmos handling
* fuck around with interaction events
SPAGHETTI CODE OH MY GOD
* more sprites and whatever the hell
* more mech shit
* more shit for equipment
* starting equipment (for nukie mechs and such)
* equipment cycling
* starting with some of the ui
* a fat chunk of ui prototyping
* done tinkering with ui
* a bunch of ui stuff and what have yous
* cleaning up grabber and state handling
* make the ui actually functional + watch me port a million icons
I swear i'll prune the sprites later blease
* start on construction
* construction yo mamma
* remove some unused files
* fix a silly
* make the graph sane
* make it actually constructible.
* print the boards as well, bozo
* rebalance part prices
* eject action
also i appease the russians by remembering to localize
* Punch Shit
* make mech integrity and repairs work
* Make the UI more based
STOMP STOMP STOMP STOMP
* make equipment even more based
* batteries and other such delights
* make the ui look pimpin af
* make the construction mega based
* UI but so epic
* equipment
* some sweat tweaks
* damage rebalancing
* restructure tech
* fix some shit
* mechs inherit access
* make icons actually use sprite specifiers
* TRAILING COMMAA!!!!!
* fix a mild indentation sin
* undo this change because it isn't needed
* actually fix this
* secret webeditting shhhh
* place this tech here
* comments
* foo
2022-12-10 11:05:39 -06:00
Morbo
42bd050888
Merge remote-tracking branch 'upstream/master' into upstream-sync2
2022-12-10 14:04:43 +03:00
Leon Friedrich
7ee2f15a14
Fix projectiles not inheriting velocities from the shooter/gun. ( #12854 )
...
Fixes https://github.com/space-wizards/space-station-14/issues/12852
2022-12-10 14:45:18 +11:00
Leon Friedrich
75ab0a1127
Fix ambient audio assert ( #12938 )
2022-12-09 12:16:39 +11:00
Morbo
2f1730f64c
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-08 08:04:31 +03:00
metalgearsloth
749b062452
Don't clip ban reason text ( #12925 )
2022-12-07 20:05:18 -06:00
Nemanja
c319a82404
fix analysis console text ( #12895 )
2022-12-08 12:28:51 +11:00
Morbo
f032966976
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
2022-12-07 08:34:29 +03:00
Alex Evgrashin
04db7d0fdd
Geiger counter ( #12082 )
2022-12-06 17:56:52 -08:00
Leon Friedrich
7f234d4e3b
Allow crew manifest window resizing ( #12825 )
2022-12-06 15:46:19 -08:00
eoineoineoin
ff9cf108b6
UX improvements to Air Alarm UI ( #12681 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2022-12-06 15:46:07 -08:00
eoineoineoin
8f641137e8
Fix bug where AirAlarmUI would display incorrect scrubber filters ( #12846 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2022-12-06 15:33:21 -08:00
nikthechampiongr
3d86baa92e
Confirmation button ( #12671 )
...
Closes https://github.com/space-wizards/space-station-14/issues/12579
2022-12-06 15:14:48 -08:00
Rane
8d1773742e
World target action uses entity coordinates ( #12484 )
2022-12-06 15:03:20 -08:00
metalgearsloth
d9a26c76e0
Fix texture crimes ( #12900 )
2022-12-06 14:35:44 +11:00
Nemanja
64fbb7908a
potato battery visualizer exception fix ( #12862 )
2022-12-05 10:50:47 +11:00
Pieter-Jan Briers
dcffadb526
Don't generate click maps for some textures. ( #12874 )
2022-12-05 10:47:24 +11:00
Pieter-Jan Briers
90cc6e391b
.Keys.Contains() -> .ContainsKey() ( #12873 )
2022-12-05 10:46:52 +11:00
Pieter-Jan Briers
f57204b872
Fix LinkBanner for replicated CVar values. ( #12845 )
...
Fixes #12843
2022-12-04 06:47:25 -06:00
Morbo
df46659618
Fix patreon link in queue
2022-12-03 07:31:24 +03:00
Morbo
612d79c8fa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Links/UILinks.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Shared/CCVar/CCVars.cs
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png
2022-12-03 07:09:10 +03:00
eoineoineoin
c324640eaf
Avoid a display bug when showing a network using multitool ( #12793 )
...
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2022-12-02 17:47:24 -08:00
Pieter-Jan Briers
a6045e4538
Launcher info links. ( #12781 )
2022-12-02 17:23:43 -08:00
