Skip to content

Commit

Permalink
Merge pull request impstation#1215 from widgetbeck/apids
Browse files Browse the repository at this point in the history
Bee Species-ification.
  • Loading branch information
Darkmajia authored Jan 6, 2025
2 parents d0c76b3 + 4d8ae0e commit e470f42
Show file tree
Hide file tree
Showing 78 changed files with 906 additions and 304 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
metabolizer-type-snail = Snail
metabolizer-type-apid = Apid
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_Impstation/species/species.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
species-name-decapoid = Decapoid
species-name-apid = Apid
33 changes: 32 additions & 1 deletion Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,41 @@
conditions:
- !type:OrganType
type: Slime
shouldHave: true
damage:
types:
Caustic: 8
- !type:PopupMessage # for apids. they're bees, they get calm if you smoke 'em
conditions:
- !type:ReagentThreshold
reagent: Water
min: 0.5
- !type:OrganType
type: Apid
type: Local
visualType: Medium
messages: [ "effect-sleepy" ]
probability: 0.1
- !type:MovespeedModifier
conditions:
- !type:ReagentThreshold
reagent: Water
min: 1
- !type:OrganType
type: Apid
walkSpeedModifier: 0.65
sprintSpeedModifier: 0.65
- !type:GenericStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Water
min: 1.8
- !type:OrganType
type: Apid
key: ForcedSleep
component: ForcedSleeping
time: 3
type: Add


- type: reagent
id: Ice
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Reagents/gases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
conditions:
- !type:OrganType
type: Plant
- !type:Oxygenate # imp special. i have to do this because metabolizer types can't inherit from one another
conditions:
- !type:OrganType
type: Apid
# Convert Oxygen into CO2.
- !type:ModifyLungGas
conditions:
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/_Impstation/Body/Organs/apid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: entity
id: OrganApidLungs
parent: [ OrganHumanLungs, OrganHumanStomach ]
name: apid lungs
description: "For beeathing."
suffix: "Apid"
components:
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Stomach
- type: Metabolizer
metabolizerTypes: [ Apid ]
maxReagents: 3
groups:
- id: Food
- id: Drink
- id: Gas
rateModifier: 100.0
- type: Lung
117 changes: 117 additions & 0 deletions Resources/Prototypes/_Impstation/Body/Parts/apid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
- type: entity
id: PartApid
parent: [BaseItem, BasePart]
name: "apid body part"
abstract: true
components:
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 3
- ReagentId: Blood
Quantity: 10

- type: entity
id: TorsoApid
name: "apid torso"
parent: [PartApid, BaseTorso]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "torso"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 10
- ReagentId: Blood
Quantity: 20

- type: entity
id: HeadApid
name: "apid head"
parent: [PartApid, BaseHead]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "head"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 5
- ReagentId: Blood
Quantity: 10

- type: entity
id: LeftArmApid
name: "left apid arm"
parent: [PartApid, BaseLeftArm]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "l_arm"

- type: entity
id: RightArmApid
name: "right apid arm"
parent: [PartApid, BaseRightArm]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "r_arm"

- type: entity
id: LeftHandApid
name: "left apid hand"
parent: [PartApid, BaseLeftHand]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "l_hand"

- type: entity
id: RightHandApid
name: "right apid hand"
parent: [PartApid, BaseRightHand]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "r_hand"

- type: entity
id: LeftLegApid
name: "left apid leg"
parent: [PartApid, BaseLeftLeg]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "l_leg"

- type: entity
id: RightLegApid
name: "right apid leg"
parent: [PartApid, BaseRightLeg]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "r_leg"

- type: entity
id: LeftFootApid
name: "left apid foot"
parent: [PartApid, BaseLeftFoot]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "l_foot"

- type: entity
id: RightFootApid
name: "right apid foot"
parent: [PartApid, BaseRightFoot]
components:
- type: Sprite
sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: "r_foot"
42 changes: 42 additions & 0 deletions Resources/Prototypes/_Impstation/Body/Prototypes/apid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
- type: body # this is just the human one but with one hand and bee lungs
id: Apid
name: "apid"
root: torso
slots:
head:
part: HeadApid
connections:
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
torso:
part: TorsoApid
connections:
- right_arm
- right_leg
- left_leg
organs:
heart: OrganHumanHeart
lungs: OrganApidLungs
stomach: OrganHumanStomach
liver: OrganHumanLiver
kidneys: OrganHumanKidneys
right_arm:
part: RightArmApid
connections:
- right_hand
right_hand:
part: RightHandApid
right_leg:
part: RightLegApid
connections:
- right_foot
left_leg:
part: LeftLegApid
connections:
- left_foot
right_foot:
part: RightFootApid
left_foot:
part: LeftFootApid
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- type: metabolizerType
id: Decapoid
name: metabolizer-type-decapoid
name: metabolizer-type-decapoid

- type: metabolizerType
id: Apid
name: metabolizer-type-apid
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
- type: marking
id: ApidAntennaeDefault
bodyPart: Hair
markingCategory: Hair
followSkinColor: false
forcedColoring: true
speciesRestriction: [ Apid ]
sprites:
- sprite: _Impstation/Mobs/Customization/apid.rsi
state: defaultAntennae

- type: marking
id: ApidAntennaeSad
bodyPart: Hair
markingCategory: Hair
followSkinColor: false
forcedColoring: true
speciesRestriction: [ Apid ]
sprites:
- sprite: _Impstation/Mobs/Customization/apid.rsi
state: antennaeSad

- type: marking
id: ApidAntennaeForward
bodyPart: Hair
markingCategory: Hair
followSkinColor: false
forcedColoring: true
speciesRestriction: [ Apid ]
sprites:
- sprite: _Impstation/Mobs/Customization/apid.rsi
state: antennaeForward

- type: marking
id: ApidAntennaeDroopy
bodyPart: Hair
markingCategory: Hair
followSkinColor: false
forcedColoring: true
speciesRestriction: [ Apid ]
sprites:
- sprite: _Impstation/Mobs/Customization/apid.rsi
state: antennaeDroopy

- type: marking
id: ApidWingsAnimatedDefault
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [ Apid ]
sprites:
- sprite: _Impstation/Mobs/Customization/apid.rsi
state: apidWingsDefault

- type: marking
id: ApidEyesDefault
bodyPart: Eyes
markingCategory: Eyes
forcedColoring: true
speciesRestriction: [ Apid ]
coloring:
default:
type:
!type:SimpleColoring
color: "#FFFFaa"
sprites:
- sprite: _Impstation/Mobs/Species/Apid/parts.rsi
state: eyes
Loading

0 comments on commit e470f42

Please sign in to comment.