Commit graph

2910 commits

Author SHA1 Message Date
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
jicksaw
5fedbf329f
Clear chat input when focus is released with Esc (#12823) 2022-12-02 17:15:59 -08:00
eoineoineoin
af51e67e1c
Add a label to make lathe UI clearer (#12805)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2022-12-02 17:13:09 -08:00
Nemanja
64f57aceb2
genericize ui fragments (#12810) 2022-12-02 16:46:58 -06:00
Morbo
f9229d979c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
2022-12-02 06:42:59 +03:00
Leon Friedrich
b771d2423a
Fix ambient sound error (#12808) 2022-12-01 09:02:37 -06:00
Kara
01e0ea7922
Ghost toggle FoV action (#12818)
* Ghost toggle FoV action

* p
2022-11-30 23:46:04 -06:00
Mr0maks
db4d37a2b7
Fix locale (#12755)
After fixing in the settings, I forgot to change it everywhere
2022-11-30 10:21:23 +01:00
Leon Friedrich
5f964f02b7
Fix melee animation exception (#12806) 2022-11-30 12:40:57 +11:00
metalgearsloth
4f6ead57bf
Revert "Multi-threaded mob movement" (#12809) 2022-11-30 12:39:02 +11:00
metalgearsloth
d8bc7e1cb7
Multi-threaded mob movement (#12611) 2022-11-30 09:41:26 +11:00
Morb
fb3f24652e
Revert "Revert "Server join queue (#583)"" (#602) 2022-11-29 06:41:12 -08:00
eclips_e
e923b15e27
Prayer Fixes (#12752)
* fixe

* no more ahelp spam

* More fixes

* i hate

* typo fix

Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
2022-11-28 22:49:20 -06:00
Morb
68a02cc1bb
Additional sponsor character slots (#548) 2022-11-27 23:39:24 -08:00
Leon Friedrich
8ec2a9ec74
Ambient sound performance improvements (#12756) 2022-11-28 12:10:40 +11:00
Paul Ritter
3884c4d3db
serv4 + submodule update (#12740)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-11-27 19:25:55 +01:00
Morb
e025a5ded1
Rework sponsor markings (#593) 2022-11-27 08:13:01 -08:00
Morbo
8ff7f8344f Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-27 15:24:12 +03:00
Morb
97973e2ed9 Revert "Server join queue (#583)"
This reverts commit 84605eacb8.
2022-11-27 04:09:27 -08:00