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

Chitinid #2707

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
9 changes: 9 additions & 0 deletions Resources/Audio/_DV/Voice/Chitinid/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- files: ["moth_scream.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from https://github.com/tgstation/tgstation/commit/31c19654e0f641166ecd80c672ea05362fd19488"
source: "https://github.com/tgstation/tgstation/commits/master/sound/voice/moth/scream_moth.ogg"

- files: ["moth_laugh.ogg, moth_chitter.ogg, moth_squeak.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d"
source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/"
ElusiveCoin marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ chat-speech-verb-rodentia-1 = squeaks
chat-speech-verb-rodentia-2 = pieps
chat-speech-verb-rodentia-3 = chatters
chat-speech-verb-rodentia-4 = squeals

chat-speech-verb-name-chitinid = Chitinid
chat-speech-verb-chitinid-1 = clicks
chat-speech-verb-chitinid-2 = chitters
chat-speech-verb-chitinid-3 = hisses
chat-speech-verb-chitinid-4 = buzzes
164 changes: 164 additions & 0 deletions Resources/Locale/en-US/_DV/markings/chitinid.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
marking-ChitinidAntennasDefault-default = Antennae
marking-ChitinidAntennasDefault = Antennae (Default)

marking-ChitinidAntennasCurly-curly = Antennae
marking-ChitinidAntennasCurly = Antennae (Curly)

marking-ChitinidAntennasGray-gray = Antennae
marking-ChitinidAntennasGray = Antennae (Gray)

marking-ChitinidAntennasSlick-slick = Antennae
marking-ChitinidAntennasSlick = Antennae (Slick)

marking-ChitinidAntennasShort-short = Antennae
marking-ChitinidAntennasShort = Antennae (short)

marking-ChitinidAntennasLong-long = Antennae
marking-ChitinidAntennasLong = Antennae (Long)

marking-ChitinidAntennasBee-bee = Antennae
marking-ChitinidAntennasBee = Antennae (Bee)

marking-ChitinidAntennasFirefly-firefly_primary = Primary
marking-ChitinidAntennasFirefly-firefly_secondary = Secondary
marking-ChitinidAntennasFirefly = Antennae (Firefly)

marking-ChitinidAntennasRadar-radar = Antennae
marking-ChitinidAntennasRadar = Antennae (Radar)

marking-ChitinidAntennasSpeed-speed = Antennae
marking-ChitinidAntennasSpeed = Antennae (Speed)



marking-ChitinidWingsDefault-default = Wing
marking-ChitinidWingsDefault = Tail (Default)

marking-ChitinidWingsSmooth-smooth = Wing
marking-ChitinidWingsSmooth = Tail (Smooth)

marking-ChitinidWingsHoneypot-honeypot_primary = Primary
marking-ChitinidWingsHoneypot-honeypot_secondary = Secondary
marking-ChitinidWingsHoneypot = Tail (Honeypot)

marking-ChitinidWingsStubby-stubby = Wing
marking-ChitinidWingsStubby = Tail (Stubby)

marking-ChitinidWingsBee-bee_primary = Primary
marking-ChitinidWingsBee-bee_secondary = Secondary
marking-ChitinidWingsBee = Tail (Bee)

marking-ChitinidWingsFirefly-firefly_primary = Primary
marking-ChitinidWingsFirefly-firefly_secondary = Secondary
marking-ChitinidWingsFirefly = Tail (Firefly)



marking-ChitinidChestCharred-charred_chest = Chest
marking-ChitinidChestCharred = Chitinid Chest (Charred)

marking-ChitinidHeadCharred-charred_head = Head
marking-ChitinidHeadCharred = Chitinid Head (Charred)

marking-ChitinidLLegCharred-charred_l_leg = Left Leg
marking-ChitinidLLegCharred = Chitinid Left Leg (Charred)

marking-ChitinidRLegCharred-charred_r_leg = Right Leg
marking-ChitinidRLegCharred = Chitinid Right Leg (Charred)

marking-ChitinidLArmCharred-charred_l_arm = Left Arm
marking-ChitinidLArmCharred = Chitinid Left Arm (Charred)

marking-ChitinidRArmCharred-charred_r_arm = Right Arm
marking-ChitinidRArmCharred = Chitinid Right Arm (Charred)



marking-ChitinidChestPlated-plated_chest = Chest
marking-ChitinidChestPlated = Chitinid Chest (Plated)

marking-ChitinidLArmPlated-plated_l_arm = Left Arm
marking-ChitinidLArmPlated = Chitinid Left Arm (Plated)

marking-ChitinidRArmPlated-plated_r_arm = Right Arm
marking-ChitinidRArmPlated = Chitinid Right Arm (Plated)



marking-ChitinidChestStripes-stripes_chest = Chest
marking-ChitinidChestStripes = Chitinid Chest (Stripes)

marking-ChitinidHeadStripes-stripes_head = Head
marking-ChitinidHeadStripes = Chitinid Head (Stripes)

marking-ChitinidLLegStripes-stripes_l_leg = Left Leg
marking-ChitinidLLegStripes = Chitinid Left Leg (Stripes)

marking-ChitinidRLegStripes-stripes_r_leg = Right Leg
marking-ChitinidRLegStripes = Chitinid Right Leg (Stripes)

marking-ChitinidLArmStripes-stripes_l_arm = Left Arm
marking-ChitinidLArmStripes = Chitinid Left Arm (Stripes)

marking-ChitinidRArmStripes-stripes_r_arm = Right Arm
marking-ChitinidRArmStripes = Chitinid Right Arm (Stripes)



marking-ChitinidChestRadiant-radiant_chest = Chest
marking-ChitinidChestRadiant = Chitinid Chest (Radiant)

marking-ChitinidHeadRadiant-radiant_head = Head
marking-ChitinidHeadRadiant = Chitinid Head (Radiant)

marking-ChitinidLLegRadiant-radiant_l_leg = Left Leg
marking-ChitinidLLegRadiant = Chitinid Left Leg (Radiant)

marking-ChitinidRLegRadiant-radiant_r_leg = Right Leg
marking-ChitinidRLegRadiant = Chitinid Right Leg (Radiant)

marking-ChitinidLArmRadiant-radiant_l_arm = Left Arm
marking-ChitinidLArmRadiant = Chitinid Left Arm (Radiant)

marking-ChitinidRArmRadiant-radiant_r_arm = Right Arm
marking-ChitinidRArmRadiant = Chitinid Right Arm (Radiant)



marking-ChitinidChestToxic-toxic_chest = Chest
marking-ChitinidChestToxic = Chitinid Chest (Toxic)

marking-ChitinidHeadToxic-toxic_head = Head
marking-ChitinidHeadToxic = Chitinid Head (Toxic)

marking-ChitinidLLegToxic-toxic_l_leg = Left Leg
marking-ChitinidLLegToxic = Chitinid Left Leg (Toxic)

marking-ChitinidRLegToxic-toxic_r_leg = Right Leg
marking-ChitinidRLegToxic = Chitinid Right Leg (Toxic)

marking-ChitinidLArmToxic-toxic_l_arm = Left Arm
marking-ChitinidLArmToxic = Chitinid Left Arm (Toxic)

marking-ChitinidRArmToxic-toxic_r_arm = Right Arm
marking-ChitinidRArmToxic = Chitinid Right Arm (Toxic)



marking-ChitinidChestSpotted-spotted_chest = Chest
marking-ChitinidChestSpotted = Chitinid Chest (Spotted)

marking-ChitinidHeadSpotted-spotted_head = Head
marking-ChitinidHeadSpotted = Chitinid Head (Spotted)

marking-ChitinidLLegSpotted-spotted_l_leg = Left Leg
marking-ChitinidLLegSpotted = Chitinid Left Leg (Spotted)

marking-ChitinidRLegSpotted-spotted_r_leg = Right Leg
marking-ChitinidRLegSpotted = Chitinid Right Leg (Spotted)

marking-ChitinidLArmSpotted-spotted_l_arm = Left Arm
marking-ChitinidLArmSpotted = Chitinid Left Arm (Spotted)

marking-ChitinidRArmSpotted-spotted_r_arm = Right Arm
marking-ChitinidRArmSpotted = Chitinid Right Arm (Spotted)
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_DV/species/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
species-name-vulpkanin = Vulpkanin
species-name-harpy = Harpy
species-name-rodentia = Rodentia
species-name-chitinid = Chitinid
1 change: 1 addition & 0 deletions Resources/Prototypes/Guidebook/species.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Felinid
- Oni
- Rodentia
- Chitinid

- type: guideEntry
id: Arachnid
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Oni
- Vulpkanin
- Rodentia
- Chitinid
# End DeltaV additions

- type: loadoutEffectGroup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Species/species_weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
Vulpkanin: 3 # DeltaV - Vulpkanin, see Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml
Rodentia: 3 # DeltaV - Rodentia, see Prototypes/_DV/Entities/Mobs/Species/rodentia.yml
Diona: 2
Chitinid: 3 # DeltaV - Chitinid, see Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
34 changes: 34 additions & 0 deletions Resources/Prototypes/_DV/Body/Organs/chitinid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
id: OrganChitinidStomach
parent: [OrganAnimalStomach, OrganHumanStomach]
name: stomach
description: "Gross. This is hard to stomach."
components:
- type: Organ # Shitmed Change
slotId: stomach # Shitmed Change
- type: Sprite
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- 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

ElusiveCoin marked this conversation as resolved.
Show resolved Hide resolved
112 changes: 112 additions & 0 deletions Resources/Prototypes/_DV/Body/Parts/chitinid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartChitinidBase
parent: [BaseItem, BasePart]
name: "Chitinid body part"
abstract: true
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 3
- ReagentId: Blood
Quantity: 10

- type: entity
id: TorsoChitinid
name: "chitinid torso"
parent: [PartChitinidBase, BaseTorso]
components:
- type: Sprite
state: "torso_m"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 10
- ReagentId: Blood
Quantity: 20


- type: entity
id: HeadChitinid
name: "chitinid head"
parent: [PartChitinidBase, BaseHead]
components:
- type: Sprite
state: "head_m"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Fat
Quantity: 5
- ReagentId: Blood
Quantity: 10

- type: entity
id: LeftArmChitinid
name: "left chitinid arm"
parent: [PartChitinidBase, BaseLeftArm]
components:
- type: Sprite
state: "l_arm"

- type: entity
id: RightArmChitinid
name: "right chitinid arm"
parent: [PartChitinidBase, BaseRightArm]
components:
- type: Sprite
state: "r_arm"

- type: entity
id: LeftHandChitinid
name: "left chitinid hand"
parent: [PartChitinidBase, BaseLeftHand]
components:
- type: Sprite
state: "l_hand"

- type: entity
id: RightHandChitinid
name: "right chitinid hand"
parent: [PartChitinidBase, BaseRightHand]
components:
- type: Sprite
state: "r_hand"

- type: entity
id: LeftLegChitinid
name: "left chitinid leg"
parent: [PartChitinidBase, BaseLeftLeg]
components:
- type: Sprite
state: "l_leg"

- type: entity
id: RightLegChitinid
name: "right chitinid leg"
parent: [PartChitinidBase, BaseRightLeg]
components:
- type: Sprite
state: "r_leg"

- type: entity
id: LeftFootChitinid
name: "left chitinid foot"
parent: [PartChitinidBase, BaseLeftFoot]
components:
- type: Sprite
state: "l_foot"

- type: entity
id: RightFootChitinid
name: "right chitinid foot"
parent: [PartChitinidBase, BaseRightFoot]
components:
- type: Sprite
state: "r_foot"
Loading
Loading