Skip to content

DeltaV/DS14 IPC Port#744

Merged
VMSolidus merged 37 commits intoSimple-Station:masterfrom
Timemaster99:dv-ipc
Aug 21, 2024
Merged

DeltaV/DS14 IPC Port#744
VMSolidus merged 37 commits intoSimple-Station:masterfrom
Timemaster99:dv-ipc

Conversation

@Timemaster99
Copy link
Copy Markdown
Contributor

@Timemaster99 Timemaster99 commented Aug 17, 2024

Description

Ported over IPC from DS14, with the fixes from DeltaV.

TODO

  • Port
  • Check for errors (Local tests wouldn't run on this one)

Media

Changelog

🆑

  • add: Added IPC as a playable species.

Day-OS and others added 14 commits August 15, 2024 20:13
@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 17, 2024
@SimpleStation14 SimpleStation14 changed the title DeltaV/DS14 IPC port DeltaV/DS14 IPC Port Aug 17, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 17, 2024 •
edited
Loading

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

Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_alt1.rsi

State Old New Status
head Removed
head-1 Added
head-2 Added
head-3 Added

Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_alt1.rsi

State Old New Status
head Added

Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi

State Old New Status
head Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_alt1.rsi

State Old New Status
head-1 Added
head-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi

State Old New Status
l_arm-1 Added
l_arm-2 Added
l_foot-1 Added
l_foot-2 Added
l_hand-1 Added
l_hand-2 Added
l_leg-1 Added
l_leg-2 Added
r_arm-1 Added
r_arm-2 Added
r_foot-1 Added
r_foot-2 Added
r_hand-1 Added
r_hand-2 Added
r_leg-1 Added
r_leg-2 Added
torso-1 Added
torso-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_monitor.rsi

State Old New Status
head-1 Added
head-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_alt1.rsi

State Old New Status
head Added

Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi

State Old New Status
head Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso Added

Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_monitor.rsi

State Old New Status
head Added

Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_alt1.rsi

State Old New Status
head-1 Added
head-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi

State Old New Status
l_arm-1 Added
l_arm-2 Added
l_foot-1 Added
l_foot-2 Added
l_hand-1 Added
l_hand-2 Added
l_leg-1 Added
l_leg-2 Added
r_arm-1 Added
r_arm-2 Added
r_foot-1 Added
r_foot-2 Added
r_hand-1 Added
r_hand-2 Added
r_leg-1 Added
r_leg-2 Added
torso-1 Added
torso-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_monitor.rsi

State Old New Status
head-1 Added
head-2 Added

Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi

State Old New Status
groin Added
head-1 Added
head-2 Added
l_arm-1 Added
l_arm-2 Added
l_foot-1 Added
l_foot-2 Added
l_hand-1 Added
l_hand-2 Added
l_leg-1 Added
l_leg-2 Added
r_arm-1 Added
r_arm-2 Added
r_foot-1 Added
r_foot-2 Added
r_hand-1 Added
r_hand-2 Added
r_leg-1 Added
r_leg-2 Added
torso-1 Added
torso-2 Added

Resources/Textures/Mobs/Customization/ipc_antenna.rsi

State Old New Status
ipc_antenna_antlers Added
ipc_antenna_crowned Added
ipc_antenna_cyberhead Added
ipc_antenna_droneeyes Added
ipc_antenna_light Added
ipc_antenna_lightb Added
ipc_antenna_sidelights Added
ipc_antenna_tesla Added
ipc_antenna_towers Added
ipc_antenna_tv Added

Resources/Textures/Mobs/Customization/ipc_screens.rsi

State Old New Status
ipc_screen_blank Added
ipc_screen_blue Added
ipc_screen_breakout Added
ipc_screen_bsod Added
ipc_screen_console Added
ipc_screen_ecgwave Added
ipc_screen_eight Added
ipc_screen_exclaim Added
ipc_screen_eyes Added
ipc_screen_eyesangry Added
ipc_screen_eyestall Added
ipc_screen_frown Added
ipc_screen_glider Added
ipc_screen_goggles Added
ipc_screen_heart Added
ipc_screen_l Added
ipc_screen_loading Added
ipc_screen_monoeye Added
ipc_screen_nature Added
ipc_screen_orange Added
ipc_screen_pink Added
ipc_screen_question Added
ipc_screen_rainbowdiag Added
ipc_screen_rainbowhoriz Added
ipc_screen_redtext Added
ipc_screen_rgb Added
ipc_screen_ring Added
ipc_screen_scroll Added
ipc_screen_shower Added
ipc_screen_sinewave Added
ipc_screen_smile Added
ipc_screen_squarewave Added
ipc_screen_stars Added
ipc_screen_static Added
ipc_screen_tetris Added
ipc_screen_textdrop Added
ipc_screen_tv Added
ipc_screen_windowsxp Added
ipc_screen_yellow Added

Resources/Textures/Mobs/Species/IPC/organs.rsi

State Old New Status
ears Added
eyeball-l Added
eyeball-r Added
heart-off Added
heart-on Added
microcell Added
tongue Added

Resources/Textures/Mobs/Species/IPC/parts.rsi

State Old New Status
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Edit: diff updated after 475411d

DangerRevolution
DangerRevolution suggested changes Aug 17, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All codebase markers: i.e SimpleStation edit need to be removed.
All files need to be moved into base game folders.

@Mnemotechnician
Copy link
Copy Markdown
Contributor

Mnemotechnician commented Aug 17, 2024

529fd4f is very sus. You probably shouldn't just remove code like that.

@DEATHB4DEFEAT
Copy link
Copy Markdown
Member

DEATHB4DEFEAT commented Aug 17, 2024

529fd4f is very sus. You probably shouldn't just remove code like that.

yeah, that code is needed

@angelofallars
Copy link
Copy Markdown
Member

angelofallars commented Aug 17, 2024

IPCs need to be disabled from selecting these traits:

  • Blood Deficiency (no bloodstream)
  • Hemophilia (no bloodstream)
  • Lightweight Drunk (can't drink)
  • Alcohol Tolerance (can't drink)
  • Voracious (can't eat/drink)
  • Liquor Lifeline (can't drink)

Will To Live and Will To Die, two traits that modify the critical threshold, should also probably be disabled too, as IPCs are designed without crit state, and these traits can give unexpected effects like giving IPCs a crit state.

@Timemaster99
Copy link
Copy Markdown
Contributor Author

Timemaster99 commented Aug 17, 2024

529fd4f is very sus. You probably shouldn't just remove code like that.

yeah, that code is needed

The delay, according to the comment, was to avoid jittering between states, which wasn't happening. The timer code would simply hang indefinitely, likely through some issue with parallelization

@ShadesMars
Copy link
Copy Markdown
Contributor

ShadesMars commented Aug 17, 2024

EstacaoPirata, SimpleStation or even DeltaV would need to be just put in normal folders.
As normally this is to aid downstreams, not upstreams.

@DangerRevolution DangerRevolution added Priority: 2-High Needs to be resolved soon Size: 1-Very Large For especially large issues/PRs Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase labels Aug 21, 2024
DangerRevolution
DangerRevolution suggested changes Aug 21, 2024
View reviewed changes
VMSolidus
VMSolidus requested changes Aug 21, 2024
View reviewed changes
@Timemaster99 @VMSolidus
Apply suggestions from code review
db4934b 
Co-authored-by: VMSolidus <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>
@Timemaster99 Timemaster99 requested a review from VMSolidus August 21, 2024 07:57
VMSolidus
VMSolidus requested changes Aug 21, 2024
View reviewed changes
VMSolidus
VMSolidus requested changes Aug 21, 2024
View reviewed changes
VMSolidus
VMSolidus requested changes Aug 21, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from InternalEncryptionKeySpawner, this is all the rest of the code cleanup.
I am NOT going to do the code cleanup for that last one via the webeditor.

@Timemaster99 @VMSolidus
Apply suggestions from code review
475411d 
Co-authored-by: VMSolidus <[email protected]>
Signed-off-by: Timemaster99 <[email protected]>
@Timemaster99
Copy link
Copy Markdown
Contributor Author

Timemaster99 commented Aug 21, 2024

Through good luck, the tests have fully passed here

@VMSolidus VMSolidus merged commit ad1d76e into Simple-Station:master Aug 21, 2024
SimpleStation14 added a commit that referenced this pull request Aug 21, 2024
@SimpleStation14
Automatic Changelog Update (#744)
17129ec
@gluesniffler gluesniffler mentioned this pull request Dec 7, 2024
Merged
4 tasks
IsNotAcceptable pushed a commit to IsNotAcceptable/VIBE-PROJECT that referenced this pull request Feb 8, 2026
@Spatison @IsNotAcceptable
Xenomorphs: part 2 (Simple-Station#744)
f22df71 
* rebalance

* oh

* looks better

* Finally
firfaronde pushed a commit to BohdanNovikov0207/Orehum-Project that referenced this pull request Feb 11, 2026
@IsNotAcceptable @Spatison
@coderabbitai @BohdanNovikov0207 @Cinkafox
[MegaUpdate] Orehum 2.0!!! (#200)
e73b4e4 
* [Feature] Xenomorphs Part 1 (Simple-Station#716)

* init commit

* xenomorph: part 1

* weed heal

* fix Rsi

* fix Yaml linter

* fix

* Xenomorphs: part 2 (Simple-Station#744)

* rebalance

* oh

* looks better

* Finally

* [Fix] Xenomotphs: part 2.5 (Simple-Station#759)

fixs

* Xenomorphs: Part 3 (Simple-Station#815)

* this is definitely one of the commits

* 1

* new facehuggers

* suffix

* Burst egg

* some fix

* Update Content.Server/_White/Xenomorphs/Queen/XenomorphQueenSystem.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Content.Server/_White/Xenomorphs/Queen/XenomorphQueenSystem.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Resources/Locale/en-US/_white/objectives/conditions/steal-target-groups.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs

* Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs

* Update Resources/Locale/ru-RU/_white/prototypes/entities/mobs/player/pets.ftl

* Update Resources/Locale/ru-RU/WWDP_TRANSLATION/_white/prototypes/entities/structures/storage/glass_box.ftl

* Update Resources/Locale/ru-RU/_white/objectives/conditions/steal-target-groups.ftl

* Update Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs

* some fix

* SelfUnBuckleDelay

* Neurotoxin now stun

* PlasmaAmmoProvider

* some fix

* fix

* some number

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* [Fix] Xenomorphs (Simple-Station#823)

* test

* test

* test

* fix

* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

* Update Resources/Locale/en-US/_white/game-tiking/game-rules/xenomorphs.ftl

* Fix typos in Russian localization for xenomorphs

Signed-off-by: Bogdan Novikov <[email protected]>

* any fix with dependency

* - add: Bark (Simple-Station#827)

* - add: bark

* - tweak: Bark now in client side

* - add: bark config in options

* - add: migration prepare

* - add: Migrations

* - add: more barks

* - add: bark preference in character profile

* - add: knob

* - add: change value by mouse wheel

* - tweak: optimise WWDP thinks

* - tweak: improve NeoTabContainer optimisation

* - add: limit of barks

* - fix: кролькины фиксы

* - fix: change things in tab id

* Update Content.Client/_White/TTS/TTSSystem.cs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* - fix: спатисон дурак блин ты сломал что то..

* - fix: спатисонов фиксы

* Update Content.Server/_White/Bark/BarkSystem.cs

* - fix: буковки

* Apply suggestions from code review

---------

Co-authored-by: Spatison <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix!!! not yet

* [Feature] Body Types (#180)

* feature: body types

* feature: body types: 2

* add: loc

* fix: rsi validate

* tweak: displasment jumpsuit

* tweak: clean up

* tweak: displasment shoes

* tweak: displasment gloves

* tweak: clean up

* tweak: displasment outerClothing

* Revert "tweak: displasment outerClothing"

This reverts commit 698fd688591a6c00a4cd19eebac7a204dce18e98.

* fix

* fix

* fix

* fix

* tweak: dwarf, Oni and Felenid now can choose slim body type

* add: outer displacement

* some fix

* some fix

* no more tags shitcode

* Reptilian body type

* harpy body type

* some fix

* rsi validator fix

* Update ClientClothingSystem.cs

* Update Model.cs

* Update MarkingManager.cs

* Update ClientClothingSystem.cs

* Update reptilian.yml

* maybe fix?

* add dependc

* boring

* build building

* до бд падения

* СС

* locale delete

* trash

* reprilian fix

* CombatMode

* fix sponsor and texture

* linter dinahu

* fix movemnet?

---------

Signed-off-by: Bogdan Novikov <[email protected]>
Co-authored-by: Spatison <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Bogdan Novikov <[email protected]>
Co-authored-by: Cinkafox <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VMSolidus VMSolidus VMSolidus approved these changes

+1 more reviewer

@DangerRevolution DangerRevolution DangerRevolution approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Timemaster99 Timemaster99

Labels

Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-High Needs to be resolved soon Size: 1-Very Large For especially large issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Timemaster99 @Mnemotechnician @DEATHB4DEFEAT @angelofallars @ShadesMars @VMSolidus @DangerRevolution @Day-OS