Skip to content

Commit

Permalink
Enemies and Allies Content Port (#956)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This is a batch of changes I made for Floof station being ported over to
the upstream branch


---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added new neutral xenos, events, and reagent slimes

---------

Signed-off-by: fenndragon <[email protected]>
Signed-off-by: SleepyScarecrow <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: SleepyScarecrow <[email protected]>
  • Loading branch information
3 people authored Sep 26, 2024
1 parent b53b555 commit af0c932
Show file tree
Hide file tree
Showing 23 changed files with 967 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
station-event-slimes-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-vent-critters-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-spider-spawn-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-reagentslime-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-meat-vents-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-neutral-xeno-vents-announcement = Confirmed sightings of alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to investigate the threat as soon as possible.
station-event-tick-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
station-event-argocyte-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
station-event-light-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
station-event-carp-vents-announcement = Confirmed sightings of hostile alien wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
station-event-space-vents-announcement = Confirmed sightings of hostile wildlife on the station. Personnel are advised to arm themselves, barricade doors, and defend themselves if necessary. Security is advised to eradicate the threat as soon as possible.
# Weak
station-event-slimes-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
station-event-spider-spawn-weak-announcement = Attention. A moderate influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity.
15 changes: 15 additions & 0 deletions Resources/Prototypes/Body/Organs/Friendstomach.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
id: OrganFriendStomach
parent: OrganAnimalStomach
noSpawn: true
components:
- type: Stomach
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 100
food:
maxVol: 50
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
24 changes: 24 additions & 0 deletions Resources/Prototypes/Body/Prototypes/Friendshaped.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: body
id: Friendshaped
name: "Friend-Shaped"
root: torso
slots:
torso:
part: TorsoAnimal
connections:
- hands
- legs
organs:
lungs: OrganAnimalLungs
stomach: OrganFriendStomach
liver: OrganAnimalLiver
heart: OrganAnimalHeart
kidneys: OrganAnimalKidneys
hands:
part: HandsAnimal
legs:
part: LegsAnimal
connections:
- feet
feet:
part: FeetAnimal
289 changes: 289 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
- type: entity
id: ReagentSlimeIchor
parent: ReagentSlime
suffix: Ichor
components:
- type: Bloodstream
bloodReagent: Ichor
- type: PointLight
color: "#f4692e"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#f4692e"

- type: entity
id: ReagentSlimeBleach
parent: ReagentSlime
suffix: Bleach
components:
- type: Bloodstream
bloodReagent: Bleach
- type: PointLight
color: "#a1000b"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#a1000b"

- type: entity
id: ReagentSlimeSoap
parent: ReagentSlime
suffix: Soap
components:
- type: Bloodstream
bloodReagent: SoapReagent
- type: PointLight
color: "#c8dfc9"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#c8dfc9"

- type: entity
id: ReagentSlimeSpacelube
parent: ReagentSlime
suffix: Spacelube
components:
- type: Bloodstream
bloodReagent: SpaceLube
- type: PointLight
color: "#77b58e"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#77b58e"

- type: entity
id: ReagentSlimeBuzzachloricbees
parent: ReagentSlime
suffix: Buzzachloricbees
components:
- type: Bloodstream
bloodReagent: BuzzochloricBees
- type: PointLight
color: "#FFD35D"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#FFD35D"

- type: entity
id: ReagentSlimeWehjuice
parent: ReagentSlime
suffix: Wehjuice
components:
- type: Bloodstream
bloodReagent: JuiceThatMakesYouWeh
- type: PointLight
color: "#59b23a"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#59b23a"

- type: entity
id: ReagentCognizine
parent: ReagentSlime
suffix: Cognizine
components:
- type: Bloodstream
bloodReagent: Cognizine
- type: PointLight
color: "#b50ee8"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#b50ee8"

- type: entity
id: ReagentSlimeNecrosol
parent: ReagentSlime
suffix: Necrosol
components:
- type: Bloodstream
bloodReagent: Necrosol
- type: PointLight
color: "#86a5bd"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#86a5bd"

- type: entity
id: ReagentSlimeSpaceDrugs
parent: ReagentSlime
suffix: SpaceDrugs
components:
- type: Bloodstream
bloodReagent: SpaceDrugs
- type: PointLight
color: "#63806e"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#63806e"

- type: entity
id: ReagentSlimeUnstableMutagen
parent: ReagentSlime
suffix: UnstableMutagen
components:
- type: Bloodstream
bloodReagent: UnstableMutagen
- type: PointLight
color: "#00ff5f"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#00ff5f"

- type: entity
id: ReagentSlimeLead
parent: ReagentSlime
suffix: Lead
components:
- type: Bloodstream
bloodReagent: Lead
- type: PointLight
color: "#5C6274"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#5C6274"

- type: entity
id: ReagentSlimechlorinetriflouride
parent: ReagentSlime
suffix: chlorinetriflouride
components:
- type: Bloodstream
bloodReagent: ChlorineTrifluoride
- type: PointLight
color: "#FFC8C8"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#FFC8C8"

- type: entity
id: ReagentSlimePotassium
parent: ReagentSlime
suffix: Potassium
components:
- type: Bloodstream
bloodReagent: Potassium
- type: PointLight
color: "#c6c8cc"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
color: "#c6c8cc"

- type: entity
id: reagentslimeVents
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
startAnnouncement: true
earliestStart: 20
reoccurrenceDelay: 12
minimumPlayers: 1
weight: 6 # Really weak compared to other critters
duration: 60
- type: VentCrittersRule
entries:
- id: ReagentSlime
prob: 0.01
- id: ReagentSlimeBeer
prob: 0.01
- id: ReagentSlimePax
prob: 0.01
- id: ReagentSlimeNocturine
prob: 0.01
- id: ReagentSlimeTHC
prob: 0.01
- id: ReagentSlimeBicaridine
prob: 0.01
- id: ReagentSlimeToxin
prob: 0.01
- id: ReagentSlimeNapalm
prob: 0.01
- id: ReagentSlimeOmnizine
prob: 0.01
- id: ReagentSlimeMuteToxin
prob: 0.01
- id: ReagentSlimeNorepinephricAcid
prob: 0.01
- id: ReagentSlimeEphedrine
prob: 0.01
- id: ReagentSlimeRobustHarvest
prob: 0.01
- id: ReagentSlimeIchor
prob: 0.01
- id: ReagentSlimeBleach
prob: 0.01
- id: ReagentSlimeSoap
prob: 0.01
- id: ReagentSlimeSpacelube
prob: 0.01
- id: ReagentSlimeBuzzachloricbees
prob: 0.01
- id: ReagentSlimeWehjuice
prob: 0.01
- id: ReagentCognizine
prob: 0.01
- id: ReagentSlimeNecrosol
prob: 0.01
- id: ReagentSlimeSpaceDrugs
prob: 0.01
- id: ReagentSlimeUnstableMutagen
prob: 0.01
- id: ReagentSlimeLead
prob: 0.01
- id: ReagentSlimechlorinetriflouride
prob: 0.01
- id: ReagentSlimePotassium
prob: 0.01
- id: ReagentSlimeLotophagoiOil
prob: 0.01
15 changes: 14 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,19 @@
- ReagentSlimeNorepinephricAcid
- ReagentSlimeEphedrine
- ReagentSlimeRobustHarvest
- ReagentSlimeIchor
- ReagentSlimeBleach
- ReagentSlimeSoap
- ReagentSlimeSpacelube
- ReagentSlimeBuzzachloricbees
- ReagentSlimeWehjuice
- ReagentCognizine
- ReagentSlimeNecrosol
- ReagentSlimeSpaceDrugs
- ReagentSlimeUnstableMutagen
- ReagentSlimeLead
- ReagentSlimechlorinetriflouride
- ReagentSlimePotassium
- ReagentSlimeLotophagoiOil
chance: 1

Expand Down Expand Up @@ -560,4 +573,4 @@
color: "#3e901c"
- type: GhostRole
prob: 1 #it's significantly more psionic than the others
description: ghost-role-information-angry-slimes-description
description: ghost-role-information-angry-slimes-description
Loading

0 comments on commit af0c932

Please sign in to comment.