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

Benos #413

Closed
wants to merge 20 commits into from
Closed

Benos #413

wants to merge 20 commits into from

Conversation

Kai518
Copy link

@Kai518 Kai518 commented May 19, 2024

Description

Alien infestation event from ss13. Also some of the facehugger bugs and missing localizing, shown in video are fixed by the time of publishing this PR.


TODO

-[] Add vent crawling, when this system will be implemented in future.


Media

Example Media Embed


Changelog

:cl Kai5:

  • add: Some of xenomorph larvas were spotted on the stations.

Kai518 added 14 commits May 14, 2024 15:07
Added aliens
Now stage 5 spawns larva inside of the host with an ability to gib it's host and turn to a normal larva
Added nests and fixed funny bug
Nest & facehugger fix
Added random event of spawning aliens
Fixed alien event
Added infected icons
New hunter ability - leap
Added Plasma counter
Added lusty xenomorpgh maiden
added Lamarr
Alien egg spawner
@github-actions github-actions bot added Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files labels May 19, 2024
@Kai518
Copy link
Author

Kai518 commented May 19, 2024

@github-actions github-actions bot added the Status: Needs Review Someone please review this label May 19, 2024
@DangerRevolution DangerRevolution added Priority: 3-Medium Needs to be resolved at some point Status: Needs Discussion Must be discussed labels May 19, 2024
@DangerRevolution DangerRevolution added Size: 1-Very Large For especially large issues/PRs Type: Feature Creation of or significant changes to a feature labels May 19, 2024
Copy link
Contributor

github-actions bot commented May 19, 2024

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

Resources/Textures/Clothing/Mask/facehugger.rsi

State Old New Status
equipped-MASK Added

Resources/Textures/Interface/Alerts/plasma_counter.rsi

State Old New Status
power_display0 Added
power_display1 Added
power_display10 Added
power_display2 Added
power_display3 Added
power_display4 Added
power_display5 Added
power_display6 Added
power_display7 Added
power_display8 Added
power_display9 Added

Resources/Textures/Interface/Alien/screen_alien.rsi

State Old New Status
act_drop Added
act_resist Added
act_rest Added
act_rest0 Added
act_throw_off Added
act_throw_on Added
chest Added
combat Added
combat_off Added
disarm Added
eyes Added
finder_center Added
finder_far Added
finder_med Added
finder_near Added
grab Added
groin Added
hand_l Added
hand_r Added
harm Added
head Added
health0 Added
health1 Added
health2 Added
health3 Added
health4 Added
health5 Added
health6 Added
health7 Added
health8 Added
help Added
l_arm Added
l_leg Added
leap_off Added
leap_on Added
lhandactive Added
mouth Added
nightvision0 Added
nightvision1 Added
pocket Added
power_display Added
pull Added
queen_finder Added
r_arm Added
r_leg Added
reserved Added
rhandactive Added
running Added
scroll_down Added
scroll_up Added
suit Added
swap_1 Added
swap_2 Added
template Added
template_frame Added
walking Added
zone_sel Added

Resources/Textures/Interface/Misc/infected.rsi

State Old New Status
infected0 Added
infected1 Added
infected2 Added
infected3 Added
infected4 Added
infected5 Added

Resources/Textures/Mobs/Aliens/Xenos/alien.rsi

State Old New Status
Crawl Added
Drone_Back_Half Added
Drone_Front_Half Added
Hunter_Back_Half Added
Hunter_Front_Half Added
Hunter_Stalking Added
Praetorian_Back_Half Added
Praetorian_Front_Half Added
Sentinel_Back_Half Added
Sentinel_Front_Half Added
Stand Added
acid Added
alien_medal Added
alien_medal_active Added
aliencuff Added
aliend Added
aliend_dead Added
aliend_husked Added
aliend_pounce Added
aliend_sleep Added
aliend_unconscious Added
alienh Added
alienh_dead Added
alienh_husked Added
alienh_pounce Added
alienh_sleep Added
alienh_unconscious Added
alienother Added
alienq Added
alienq_dead Added
alienq_husked Added
alienq_sleep Added
alienq_unconscious Added
aliens Added
aliens_dead Added
aliens_husked Added
aliens_pounce Added
aliens_sleep Added
aliens_unconscious Added
alienspit Added
alienspit_leap Added
burst_lie Added
burst_stand Added
bursted_lie Added
bursted_stand Added
chitin Added
claw Added
egg Added
egg_growing Added
egg_hatched Added
egg_opening Added
facehugger Added
facehugger_dead Added
facehugger_impregnated Added
facehugger_inactive Added
facehugger_thrown Added
infected0 Added
infected1 Added
infected2 Added
infected3 Added
infected4 Added
infected5 Added
infected_old Added
larva0 Added
larva0_cuff Added
larva0_dead Added
larva0_sleep Added
larva0_stun Added
larva1 Added
larva1_cuff Added
larva1_dead Added
larva1_sleep Added
larva1_stun Added
larva2 Added
larva2_cuff Added
larva2_dead Added
larva2_sleep Added
larva2_stun Added
maid Added
maid_dead Added
nestoverlay Added
tail_lash Added

Resources/Textures/Mobs/Aliens/Xenos/alien_hunter_jump.rsi

State Old New Status
icon Added

Resources/Textures/Mobs/Aliens/Xenos/alienqueen.rsi

State Old New Status
aliencuff_p Added
aliencuff_q Added
alienp Added
alienp_dead Added
alienp_husked Added
alienp_running Added
alienp_sleep Added
alienp_unconscious Added
alienq Added
alienq_dead Added
alienq_husked Added
alienq_running Added
alienq_sleep Added
alienq_unconscious Added
alienqmaid_husked Added
alienspit_p Added
alienspit_q Added
facehugger_inactivep_l Added
facehugger_inactivep_r Added
facehugger_inactiveq_l Added
facehugger_inactiveq_r Added
facehuggerp_l Added
facehuggerp_r Added
facehuggerq_l Added
facehuggerq_r Added

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

State Old New Status
acid_gland Added
brain-x Added
eggsac Added
hivenode Added
plasma_vessel Added

Resources/Textures/Structures/Walls/resin.rsi

State Old New Status
full Added
resinwall0 Added
resinwall1 Added
resinwall2 Added

Edit: diff updated after 5b85df8

Copy link
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.

Very nice surprise PR; I'm assuming you're still working on this so this is all I'll review

@@ -477,3 +477,25 @@
minimumPlayers: 20
weight: 5
- type: MobReplacementRule

- type: entity
id: AlienInfestation
Copy link
Contributor

Choose a reason for hiding this comment

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

Resources/Prototypes/DeltaV/GameRules/events.yml

XenoVentsRule

This needs to remove / replace / alter XenoVentsRule.

Now alien infestation replaces xeno vents gamerule
@DangerRevolution
Copy link
Contributor

.rsi is the only valid test fail, others are related to Microsoft

@Kai518
Copy link
Author

Kai518 commented May 19, 2024

.rsi is the only valid test fail, others are related to Microsoft

Can you please say, what is actually wrong with rsi. I am new to contributing...

@DangerRevolution
Copy link
Contributor

.rsi is the only valid test fail, others are related to Microsoft

Can you please say, what is actually wrong with rsi. I am new to contributing...

https://github.com/Simple-Station/Einstein-Engines/actions/runs/9147685738/job/25149458256?pr=413

It's all in here, it doesn't like how some of the licenses are typed in and some of the meta.jsons are missing states I think.

Copy link
Contributor

@Peptide90 Peptide90 left a comment

Choose a reason for hiding this comment

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

null isn’t valid for license and version and yeah missing states.

did you also actually make the sprites for the plasma power display or are they ported from SS13 like the other CM stuff? As you’ll need to reference the commit it’s taken from. RSI edit is good for this.

@DangerRevolution
Copy link
Contributor

null isn’t valid for license and version and yeah missing states.

did you also actually make the sprites for the plasma power display or are they ported from SS13 like the other CM stuff? As you’ll need to reference the commit it’s taken from. RSI edit is good for this.

Yuh, I'm also curious as to where these Sprites are from

@Kai518
Copy link
Author

Kai518 commented May 19, 2024

null isn’t valid for license and version and yeah missing states.

did you also actually make the sprites for the plasma power display or are they ported from SS13 like the other CM stuff? As you’ll need to reference the commit it’s taken from. RSI edit is good for this.

Background for them I've got from tgstation (license is written in screen-alien.rsi), and paitned numbers on it, cuz I haven't found any way to display actual numbers on status icon

@VMSolidus
Copy link
Member

So I'll preface this that we aren't really going to be accepting sprites ported from /tg/station, when far better sprites can be found on Baystation and its downstreams, such as Paradise.

Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

This PR lack a ton of documentation and TG Sprite/Gameplay seem, off...
I feel theres better ways to do this in SS14 then just following what SS13 Did.

namespace Content.Client.Aliens;

/// <summary>
/// This is used for...
Copy link
Member

Choose a reason for hiding this comment

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

Summary needed

namespace Content.Client.Aliens.Systems;

/// <summary>
/// This handles...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

SubscribeLocalEvent<EyeComponent, ToggleLightingAlienActionEvent>(OnToggleLighting);
}

private void OnStartup(EntityUid uid, AlienComponent component, ComponentStartup args)
Copy link
Member

Choose a reason for hiding this comment

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

This function is not used at all, is it needed?

namespace Content.Client.Aliens.Systems;

/// <summary>
/// This handles...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

Also is this... System... used for anything?

namespace Content.Client.Overlays;

/// <summary>
/// This handles...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

namespace Content.Shared.Aliens.Systems;

/// <summary>
/// This handles...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

@@ -90,10 +90,12 @@ public enum ChatChannel : ushort
/// </summary>
Telepathic = 1 << 15,

XenoHivemind = 2 << 2,
Copy link
Member

Choose a reason for hiding this comment

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

This should be 16

/// </summary>
Telepathic = ChatChannel.Telepathic,

XenoHivemind = ChatChannel.XenoHivemind,
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

namespace Content.Shared.Medical;

/// <summary>
/// This handles...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

namespace Content.Shared.Medical;

/// <summary>
/// This is used for...
Copy link
Member

Choose a reason for hiding this comment

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

Summary Needed

@DangerRevolution DangerRevolution added the Status: Derelict Has not been active for a while label Jun 14, 2024
@DangerRevolution
Copy link
Contributor

Closed as derelict; reopen if you come back to this :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 1-Very Large For especially large issues/PRs Status: Derelict Has not been active for a while Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants