Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream 28.08.2024 #68

Merged
merged 30 commits into from
Aug 28, 2024
Merged

Upstream 28.08.2024 #68

merged 30 commits into from
Aug 28, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

Emisse and others added 30 commits August 27, 2024 17:38
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
* real

* AI

* proto fix
* Fix PostMapInit tests nto considering job containerspawns

* fix
updooted cog
Love to see it
grug storageuicontroller
Update AI camera to 13 default

Holo was a placeholder. This is better in the interim.
* bagel update

* ore processor cargo
* Add some more stuff to AI whitelist

* by the nine
Delete extra pipe & fix disposals junction
* TryGetContainerContainer

* Math

* Changed AddMarkup to AddMarkupOrThrow

* Better math

* engine version

* engine version
* Black suspenders

* fix

* fix linter
@doublechest0 doublechest0 merged commit 1dc0578 into master Aug 28, 2024
9 of 13 checks passed
Copy link
Contributor

RSI Diff Bot; head commit abae69e merging into 30d5ef8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Belt/suspenders_black.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Interface/Actions/actions_ai.rsi

State Old New Status
ai_core Added
camera_light Added
crew_monitor Added
manifest Added
state_laws Added

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
StationAi Added

Resources/Textures/Interface/noise.rsi

State Old New Status
noise Added

Resources/Textures/Mobs/Silicon/output.rsi

State Old New Status
ai-banned-unshaded Added
ai-banned Added
ai-banned_dead-unshaded Added
ai-banned_dead Added
ai-empty-unshaded Added
ai-empty Added
ai-holo-old-unshaded Added
ai-holo-old Added
ai-unshaded Added
ai Added
ai_dead-unshaded Added
ai_dead Added
default-unshaded Added
default Added
floating_face-unshaded Added
floating_face Added
horror-unshaded Added
horror Added
xeno_queen-unshaded Added
xeno_queen Added

Resources/Textures/Mobs/Silicon/station_ai.rsi

State Old New Status
ai Added
ai_camera Added
ai_dead Added
ai_empty Added
base Added
default Added

Resources/Textures/Objects/Devices/ai_card.rsi

State Old New Status
base Added
empty Added
full Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Devices/output.rsi

State Old New Status
aicard-full-unshaded Added
aicard-full Added
aicard-unshaded Added
aicard Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants