Skip to content

Commit

Permalink
Merge branch 'master' into Desert-eagle-pistol
Browse files Browse the repository at this point in the history
  • Loading branch information
HungryCuban authored Jan 28, 2025
2 parents f92028d + b5a261f commit f8374e2
Show file tree
Hide file tree
Showing 184 changed files with 2,328 additions and 396 deletions.
2 changes: 1 addition & 1 deletion Content.PatreonParser/Content.PatreonParser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
Expand Down
10 changes: 5 additions & 5 deletions Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ public abstract partial class SharedPuddleSystem
private const string WaterDirty = "WaterDirty";
[ValidatePrototypeId<ReagentPrototype>]
private const string WaterIrradiated = "WaterIrradiated";
[ValidatePrototypeId<ReagentPrototype>]
private const string WastelandBlood = "WastelandBlood";
[ValidatePrototypeId<ReagentPrototype>]
private const string Blood = "Blood";
// [ValidatePrototypeId<ReagentPrototype>]
// private const string WastelandBlood = "WastelandBlood";
// [ValidatePrototypeId<ReagentPrototype>]
// private const string Blood = "Blood";

public static readonly string[] EvaporationReagents = [Water, WaterDirty, WaterIrradiated, WastelandBlood, Blood];
public static readonly string[] EvaporationReagents = [Water, WaterDirty, WaterIrradiated];

public bool CanFullyEvaporate(Solution solution)
{
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Nuclear14/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

species-name-ghoul = Ghoul
species-name-ghoul-glowing = Glowing Ghoul
species-name-ratfolk = Rat Folk
species-name-ratmonarch = Rat Monarch
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/_Nuclear14/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ trait-description-Chinese = You can understand and speak the Chinese language. W
language-English-name = English
language-English-description = The common language of the Wasteland.
chat-language-English-name = EN
language-Chinese-name = Chinese
language-Chinese-description = You can understand and speak the Chinese language. Whether through learning or backstory.
chat-language-Chinese-name = CN
language-Tribal-name = Tribal
language-Tribal-description = You can understand and speak the local Tribal language. Whether through learning or backstory.
language-Tribal-description = You can understand and speak the local Tribal language. Whether through learning or backstory.
chat-language-Tribal-name = T
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/language/languages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ language-Moffic-description = The language of the mothpeople borders on complete
language-RobotTalk-name = RobotTalk
language-RobotTalk-description = A language consisting of harsh binary chirps, whistles, hisses, and whines. Organic tongues cannot speak it without aid from special translators.
language-Sign-name = Tau-Ceti Basic Sign Language
language-Sign-description = TCB-SL for short, this sign language is prevalent among mute and deaf people.
language-Sign-name = Basic Sign Language
language-Sign-description = BSL - This sign language is prevalent among mute and deaf people.
language-Marish-name = Marish
language-Marish-description = An inherently empathetic language, conveying emotions with a single word; spoken effortlessly by Shadowkins, though nearly impossible to learn or replicate.
Expand Down
188 changes: 188 additions & 0 deletions Resources/Prototypes/_Nuclear14/Body/Organs/ratfolk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
- type: entity
id: N14BaseRatFolkOrgan
parent: BaseHumanOrgan
abstract: true
components:
- type: Sprite
netsync: false
sprite: _Nuclear14\Mobs\Species\Ratfolk\organs.rsi
- type: Organ
- type: Food
- type: Extractable
grindableSolutionName: organ
- type: SolutionContainerManager
solutions:
organ:
reagents:
- ReagentId: Nutriment
Quantity: 10

- type: entity
id: N14OrganRatFolkBrain
parent: N14BaseRatFolkOrgan
name: brain
description: "Dreams of nothing but cheese."
components:
- type: Sprite
state: brain
- type: Organ
- type: Input
context: "ghost"
- type: InputMover
- type: MovementSpeedModifier
baseWalkSpeed: 0
baseSprintSpeed: 0
- type: GhostOnMove
- type: Brain

- type: entity
id: N14OrganRatFolkEyes
parent: N14BaseRatFolkOrgan
name: eyes
description: "Red and bright. A bit unnerving, to be honest."
components:
- type: Sprite
layers:
- state: eyeball-l
- state: eyeball-r
- type: Organ

- type: entity
id: N14OrganRatFolkTongue
parent: N14BaseRatFolkOrgan
name: tongue
description: "No one can hear them squeak now."
components:
- type: Sprite
state: tongue
- type: Organ

- type: entity
id: N14OrganRatFolkAppendix
parent: N14BaseRatFolkOrgan
name: appendix
components:
- type: Sprite
layers:
- state: appendix
- state: appendix-inflamed
visible: false
- type: Organ

- type: entity
id: N14OrganRatFolkEars
parent: N14BaseRatFolkOrgan
name: ears
description: "All the better to hear you with."
components:
- type: Sprite
state: ears
- type: Organ

- type: entity
id: N14OrganRatFolkLungs
parent: N14BaseRatFolkOrgan
name: lungs
description: "Why anyone would hold this is beyond any rational thought."
components:
- type: Sprite
layers:
- state: lung-l
- state: lung-r
- type: Organ
- type: Lung
- type: Metabolizer
removeEmpty: true
solutionOnBody: false
solution: "Lung"
metabolizerTypes: [ Human ]
groups:
- id: Gas
rateModifier: 100.0
- type: SolutionContainerManager
solutions:
organ:
reagents:
- ReagentId: Nutriment
Quantity: 10
Lung:
maxVol: 100.0
canReact: false

- type: entity
id: N14OrganRatFolkHeart
parent: N14BaseRatFolkOrgan
name: heart
description: "Cheesed to meet you."
components:
- type: Sprite
state: heart-on
- type: Organ
# The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs.
# This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
# You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
- type: Metabolizer
maxReagents: 2
metabolizerTypes: [Human]
groups:
- id: Medicine
- id: Poison
- id: Narcotic

- type: entity
id: N14OrganRatFolkStomach
parent: N14BaseRatFolkOrgan
name: stomach
description: "A lot bigger than you'd thought it'd be."
components:
- type: Sprite
state: stomach
- type: Organ
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50
- type: Stomach
# The stomach metabolizes stuff like foods and drinks.
# TODO: Have it work off of the ent's solution container, and move this
# to intestines instead.
- type: Metabolizer
# mm yummy
maxReagents: 3
metabolizerTypes: [Human]
groups:
- id: Food
- id: Drink

- type: entity
id: N14OrganRatFolkLiver
parent: N14BaseRatFolkOrgan
name: liver
description: "Pairing suggestion: cheddar and rice."
components:
- type: Sprite
state: liver
- type: Organ
- type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
maxReagents: 1
metabolizerTypes: [Human]
groups:
- id: Alcohol
rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink

- type: entity
id: N14OrganRatFolkKidneys
parent: N14BaseRatFolkOrgan
name: kidneys
description: "Small and spongy looking."
components:
- type: Sprite
layers:
- state: kidney-l
- state: kidney-r
- type: Organ
# The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
- type: Metabolizer
maxReagents: 5
metabolizerTypes: [Human]
removeEmpty: true
Loading

0 comments on commit f8374e2

Please sign in to comment.