Morbo
283f94dced
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-13 20:41:52 +03:00
metalgearsloth
5a756a0094
Network pacifiedcomponent ( #13012 )
2022-12-13 11:02:02 -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
Chief-Engineer
388d186fc7
Add stamina logs ( #12921 )
2022-12-12 15:21:15 +11:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +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
83fede79eb
Add simple miss chances for NPCs ( #12978 )
...
Doesn't consider juking potential but okay for now.
2022-12-11 07:37:09 -06: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
Nemanja
ef8db74533
mech equipment fix ( #12969 )
2022-12-11 05:31:55 -06:00
Morbo
024f4113a9
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-11 07:59:37 +03:00
Paul Ritter
bca66488bf
more proper serv4 usage because i forgot to push for the last pr ( #12965 )
2022-12-11 00:25:04 +01:00
Paul Ritter
5715b0c2be
Changes needed for new notnullableflaganalyzer ( #12957 )
2022-12-11 00:19:37 +01:00
Rane
2b69854ed7
blinding networking ( #12937 )
2022-12-10 14:26:17 -06: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
keronshb
153fcd2172
Refactors blocking system, fixes exception ( #12947 )
2022-12-10 14:42:38 +11:00
Nemanja
9db34a4e8a
make legs affect movement speed with body ( #12928 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-10 02:08:47 +01:00
Nemanja
45b72d4852
nullable parts in body prototypes ( #12935 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-10 02:07:09 +01:00
Morbo
2f1730f64c
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-08 08:04:31 +03:00
metalgearsloth
ca60c14b03
Fix planet footstep modifier ( #12887 )
2022-12-08 12:56:12 +11:00
Kara
8bf0d16fad
Revert "Kicking AFK players ( #12812 )" ( #12909 )
...
This reverts commit ca260ee666 .
2022-12-08 01:07:58 +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
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
metalgearsloth
b4688bc682
Revolver fixes ( #12697 )
2022-12-06 15:38:10 -08:00
Rane
21906f45bf
examine for stealth effect ( #12486 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-12-06 15:18:46 -08:00
Rane
8d1773742e
World target action uses entity coordinates ( #12484 )
2022-12-06 15:03:20 -08:00
Vordenburg
54397ca4a7
Use IContainer instead of BaseContainer. ( #12876 )
2022-12-06 10:03:58 +13:00
metalgearsloth
b4f4de211e
Fix planet tile friction ( #12886 )
...
Falls back to default friction on empty tiles where a planet has gravity.
2022-12-04 21:47:08 -06:00
Nemanja
80d06362c5
vehicle access fix ( #12868 )
2022-12-04 18:23:59 -06:00
Morb
37451fc974
Revert "Join min playtime ( #604 )" ( #615 )
2022-12-03 05:14:08 -08: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
Pieter-Jan Briers
a6045e4538
Launcher info links. ( #12781 )
2022-12-02 17:23:43 -08: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
Morb
d956b8bfcc
Panic bunker min overall playtime & deny reason ( #12811 )
...
* Add min overall hours & reason
* Disable show reason by default
2022-12-01 10:41:47 -06:00
Morb
ca260ee666
Kicking AFK players ( #12812 )
...
* Kicking AFK players
* Set correct CCvar values
2022-12-01 10:38:20 -06:00
Morb
2409fea950
Join min playtime ( #604 )
2022-11-29 20:15:56 -08: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
Morbo
e49f4d6b63
Hotfix markings select
2022-11-28 13:30:44 +03:00
Morb
68a02cc1bb
Additional sponsor character slots ( #548 )
2022-11-27 23:39:24 -08:00
Morb
5d310c8df6
Hotifx sponsors ( #597 )
2022-11-27 22:26:19 -08:00
Vera Aguilera Puerto
d05b2a8e71
InventoryComponent type handler for entities in inv slots ( #12026 )
2022-11-28 14:01:50 +11:00
Leon Friedrich
b9db87ac2b
Fix Implant exception ( #12785 )
2022-11-28 13:33:59 +11: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