Rebase Blood Drinker System, Arachne, Oneirophage #438

VMSolidus · 2024-06-10T16:58:26Z

Description

This is a simple rebase of the Blood Drinker System, and its related features that have been commented out and/or omitted due to its lack of rebase. I am NOT substantially updating any of this code at this time, outside of the barest minimum updates needed to make it run in the first place. The reason I am doing this is that I require the Blood Drinker system functional as a prerequisite for future features, and I will update or refactor it when needed.

Arachne are still pending a Full Rework, but that is beyond the scope of this PR.

TODO

Make the code functional
Port Arachne
Uncomment Oneirophages
Re-add Oneirophage midround event

Changelog

🆑

add: Arachne have been reimplemented!
add: Oneirophages are back!

github-actions · 2024-06-10T20:01:02Z

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

Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi

State	Old	New	Status
female_full			Added
female_none			Added
female_top			Added
full			Added
male_full			Added
male_none			Added
male_top			Added
none			Added
top			Added
unisex_full			Added
unisex_none			Added
unisex_top			Added

Resources/Textures/Mobs/Customization/spidereyes.rsi

State	Old	New	Status
eyes			Added

Resources/Textures/Mobs/Species/arachne.rsi

State	Old	New	Status
spider_body			Added
spider_body_front			Added

Resources/Textures/Mobs/Species/eyes.rsi

State	Old	New	Status
eyes			Added

Resources/Textures/Nyanotrasen/Structures/cocoon.rsi

State	Old	New	Status
cocoon1			Added
cocoon2			Added
cocoon3			Added
cocoon_large1			Added
cocoon_large2			Added
cocoon_large3			Added

Edit: diff updated after 6a0ff15

VMSolidus · 2024-06-10T20:25:53Z

DONE

FoxxoTrystan · 2024-06-11T01:22:50Z

What about the "normal" spooders?

VMSolidus · 2024-06-11T01:23:45Z

You know, there's no reason I couldn't, only that it would require touching a lot of the "Wizcode" spider stuff. :)

FoxxoTrystan · 2024-06-11T01:27:04Z

Resources/Prototypes/Entities/Mobs/Species/arachne.yml

Now That "Languages" got merged, specie should have a LanguageSpeaker Component.

Or they will go to the fallback as MobBase (if its is the right one)

They're using MobBaseHuman right now, so they are defaulted to Galactic Common + Sol Common. I haven't had a chance to really think about what language they should use to be fair.

DangerRevolution

They need a language to come with; and I also wanted to ask what the plan would be for Arachnids, what direction to take them if Arachnes become the vampires.

DangerRevolution · 2024-06-20T22:35:51Z

Content.Server/Vampire/BloodSuckerComponent.cs

+        /// Whether to inject chems into a chemstream when we suck something.
+        /// </summary>
+        [DataField("injectWhenSucc")]
+        public bool InjectWhenSucc = false;


Woah; cool possibities here for snake people

DangerRevolution · 2024-06-20T22:36:19Z

Content.Server/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs

+{
+    [RegisterComponent]
+    /// <summary>
+    /// Item that gives a bloodsucker injection glands (for poison, usually)


VMSolidus · 2024-06-20T22:47:08Z

They need a language to come with; and I also wanted to ask what the plan would be for Arachnids, what direction to take them if Arachnes become the vampires.

So longer term, I'm actually going to comprehensively rework the Vampirism mechanic to later go with Arachne. I just needed this system rebased for other purposes, and changed as little as feasibly possible to get it working.

Arachnids are meant to be parallel to it, it sort of fits in with a longer term goal that server hosts should just be able to toggle on or off any species they want for their server. If that means toggling off Arachnids and turning on Arachne, or vice versa, or having both enabled at the same time, that's on them. We can have defaults set(and the default for EE species is just, "All of them on by default".)

For now I think I'm going to leave it as Sol Common in keeping with the "Humans & Human Mutants" theme. When I rework them it'll be fine for me to write a language just for Arachne.

DangerRevolution

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

DangerRevolution · 2024-06-20T22:52:45Z

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

If you don't want to, I'll drum something up tomorrow morning.

VMSolidus · 2024-06-20T22:53:34Z

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

If you don't want to, I'll drum something up tomorrow morning.

Alright! I'm not opposed to you doing that, I'd actually really appreciate it if you did.

github-actions · 2024-06-30T18:26:45Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

DangerRevolution · 2024-07-09T07:59:37Z

Completely forgot to make a language lol, now saw this as it's mirrored to Delta. Will make one in 12 hours...

FoxxoTrystan · 2024-07-09T09:05:56Z

Completely forgot to make a language lol, now saw this as it's mirrored to Delta. Will make one in 12 hours...

If mutan they should use Sol Common but also if you do have a good design for a spooder langauge il give it to others spiders, tho if no design idea come in mind , i have one already.

DangerRevolution · 2024-07-09T09:21:32Z

Completely forgot to make a language lol, now saw this as it's mirrored to Delta. Will make one in 12 hours...

If mutan they should use Sol Common but also if you do have a good design for a spooder langauge il give it to others spiders, tho if no design idea come in mind , i have one already.

honestly idm; languages can always be re-visited with lore, whatever works

github-actions · 2024-07-20T05:29:11Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions · 2024-07-20T06:41:08Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

I was too lazy to make Arachne language

VMSolidus added 2 commits June 10, 2024 12:05

Start of Arachne Port

a90fe7f

Finishing arachne system

8432e2c

github-actions bot added the Changes: C# Changes any cs files label Jun 10, 2024

Oneirophage complete

79e1110

github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jun 10, 2024

DangerRevolution requested review from DEATHB4DEFEAT, Pspritechologist and DangerRevolution June 10, 2024 20:13

github-actions bot added the Status: Needs Review Someone please review this label Jun 10, 2024

DangerRevolution added Priority: 2-High Needs to be resolved as soon as possible Holy Shit Size: 2-Large For large issues/PRs Type: Feature Creation of or significant changes to a feature labels Jun 10, 2024

PORTING COMPLETE

7675df8

VMSolidus marked this pull request as ready for review June 10, 2024 20:25

VMSolidus added 2 commits June 10, 2024 16:35

Needed tags

90ba45b

remove unused usings

30d319f

FoxxoTrystan reviewed Jun 11, 2024

View reviewed changes

Bonktrauma mentioned this pull request Jun 12, 2024

Pre-Rebase features still missing DeltaV-Station/Delta-v#1181

Open

10 tasks

DangerRevolution assigned VMSolidus Jun 20, 2024

DangerRevolution suggested changes Jun 20, 2024

View reviewed changes

DangerRevolution previously requested changes Jun 20, 2024

View reviewed changes

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 30, 2024

Merge branch 'master' into Rebase-Arachne

6a5ceb9

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 30, 2024

ghost mentioned this pull request Jul 9, 2024

Arachne Port (Real?) DeltaV-Station/Delta-v#1473

Closed

8 tasks

Update arachne.yml

470ef8b

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 20, 2024

Merge branch 'master' into Rebase-Arachne

eb8e7d2

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot added Status: Merge Conflict FIX YOUR PR AAAGH and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Jul 20, 2024

Merge branch 'master' into Rebase-Arachne

6a0ff15

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 21, 2024

DEATHB4DEFEAT removed the Holy Shit label Jul 23, 2024

DangerRevolution approved these changes Aug 5, 2024

View reviewed changes

OldDanceJacket approved these changes Aug 6, 2024

View reviewed changes

OldDanceJacket merged commit 981b7dd into Simple-Station:master Aug 6, 2024
13 checks passed

SimpleStation14 added a commit that referenced this pull request Aug 6, 2024

Automatic Changelog Update (#438)

c2d83e4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase Blood Drinker System, Arachne, Oneirophage #438

Rebase Blood Drinker System, Arachne, Oneirophage #438

VMSolidus commented Jun 10, 2024 •

edited

Loading

github-actions bot commented Jun 10, 2024 •

edited

Loading

VMSolidus commented Jun 10, 2024

FoxxoTrystan commented Jun 11, 2024

VMSolidus commented Jun 11, 2024

FoxxoTrystan Jun 11, 2024

VMSolidus Jun 11, 2024

DangerRevolution left a comment

DangerRevolution Jun 20, 2024

DangerRevolution Jun 20, 2024

VMSolidus commented Jun 20, 2024

DangerRevolution left a comment

DangerRevolution commented Jun 20, 2024

VMSolidus commented Jun 20, 2024

github-actions bot commented Jun 30, 2024

DangerRevolution commented Jul 9, 2024

FoxxoTrystan commented Jul 9, 2024

DangerRevolution commented Jul 9, 2024

github-actions bot commented Jul 20, 2024

github-actions bot commented Jul 20, 2024

Rebase Blood Drinker System, Arachne, Oneirophage #438

Rebase Blood Drinker System, Arachne, Oneirophage #438

Conversation

VMSolidus commented Jun 10, 2024 • edited Loading

Description

TODO

Changelog

github-actions bot commented Jun 10, 2024 • edited Loading

VMSolidus commented Jun 10, 2024

FoxxoTrystan commented Jun 11, 2024

VMSolidus commented Jun 11, 2024

FoxxoTrystan Jun 11, 2024

Choose a reason for hiding this comment

VMSolidus Jun 11, 2024

Choose a reason for hiding this comment

DangerRevolution left a comment

Choose a reason for hiding this comment

DangerRevolution Jun 20, 2024

Choose a reason for hiding this comment

DangerRevolution Jun 20, 2024

Choose a reason for hiding this comment

VMSolidus commented Jun 20, 2024

DangerRevolution left a comment

Choose a reason for hiding this comment

DangerRevolution commented Jun 20, 2024

VMSolidus commented Jun 20, 2024

github-actions bot commented Jun 30, 2024

DangerRevolution commented Jul 9, 2024

FoxxoTrystan commented Jul 9, 2024

DangerRevolution commented Jul 9, 2024

github-actions bot commented Jul 20, 2024

github-actions bot commented Jul 20, 2024

VMSolidus commented Jun 10, 2024 •

edited

Loading

github-actions bot commented Jun 10, 2024 •

edited

Loading