Morbo
283f94dced
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-13 20:41:52 +03:00
metalgearsloth
043079384d
Change planet command gas constants ( #13014 )
2022-12-13 21:26:35 +11:00
Pieter-Jan Briers
32908fee67
Fix thread pool IoC context bug in DecalSystem. ( #12993 )
...
Fixes https://github.com/space-wizards/space-station-14/issues/12992
2022-12-13 09:45:29 +11: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
666d81a869
Ignore non-hard bodies for npc steering ( #12990 )
2022-12-12 04:20:13 -06: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
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
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
Leon Friedrich
bc7754a70d
Fix projectile exception ( #12956 )
2022-12-11 09:56:09 +11:00
Errant
b6e382fe82
Handcuffing in Harm mode ( #12838 )
2022-12-11 09:55:18 +11:00
Nemanja
7702e334d7
fix ripley grabber bugs ( #12962 )
2022-12-10 15:00:04 -06:00
DrSmugleaf
407a907a2f
Fix error when spawning nuke ops ( #12961 )
2022-12-10 21:58:25 +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
metalgearsloth
f8a8b41976
Fix rat pathfinding ( #12951 )
...
Fixes https://github.com/space-wizards/space-station-14/issues/12950
2022-12-10 20:31:02 +11: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
metalgearsloth
a8f9d1a79f
Specify LoadMap for nukie planet ( #12696 )
2022-12-10 14:40:56 +11:00
Nemanja
250fde746f
make nukie round-end screen good ( #12949 )
...
* make nukie round-end screen good
* UNCOMMENT THIS YOU BUFFOON
2022-12-09 20:08:40 -06: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
DrSmugleaf
4a17d2cb33
Remove redundant resolve in NukeopsRuleSystem ( #12948 )
2022-12-10 01:16:33 +01:00
Leon Friedrich
abaa6c6dd9
Increase error tolerance of power debug assert ( #12828 )
2022-12-09 12:48:53 +11:00
Chief-Engineer
b49762eae5
Add logs for pointing ( #12920 )
2022-12-09 12:18:13 +11:00
Chief-Engineer
3d003fdd02
Fix and reclassify existing anchor logs ( #12926 )
2022-12-09 12:17:56 +11:00
Morbo
2f1730f64c
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-12-08 08:04:31 +03:00
metalgearsloth
5c4f32454f
Fix landing sounds on planetmaps ( #12888 )
2022-12-08 12:47:31 +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
metalgearsloth
540a3d9028
Increase NPC chase persistence ( #12850 )
2022-12-06 15:34:23 -08:00
metalgearsloth
dd384c55a0
Pathfinder tweaks ( #12848 )
2022-12-06 15:33:44 -08:00
Justin Trotter
ef5b2a19fa
toggle internals icon uses back internals ( #12478 )
2022-12-06 15:14:08 -08:00
metalgearsloth
2ff2ba89a1
Fix NPCs stopping steering on 1 bad path ( #12571 )
2022-12-06 15:11:05 -08:00
Rane
8d1773742e
World target action uses entity coordinates ( #12484 )
2022-12-06 15:03:20 -08:00
Bright0
f55d85a975
Fix item cabinet locking while open and locker favoritism ( #12508 )
...
Co-authored-by: Moony <moony@hellomouse.net>
Fixes https://github.com/space-wizards/space-station-14/issues/12426
2022-12-06 14:59:59 -08:00
dontbetank
0951db243e
Change the hunger and thirst values of animals ( #12780 )
2022-12-06 14:56:14 -08:00
metalgearsloth
5010f199ad
Add support for FTL points ( #12891 )
2022-12-06 13:12:34 +11:00
Nemanja
f4202eec18
artifact analyzer roundstart linking fix ( #12870 )
...
Fixes https://github.com/space-wizards/space-station-14/issues/12784
2022-12-04 18:35:07 -08:00
Pieter-Jan Briers
90cc6e391b
.Keys.Contains() -> .ContainsKey() ( #12873 )
2022-12-05 10:46:52 +11:00
Leon Friedrich
f99f681815
Escape paper input ( #12863 )
2022-12-04 03:32:44 -06:00
Morb
9b51cabde2
Fix queue AFK kick ( #617 )
2022-12-03 23:04:57 -08: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