Skip to content

Commit

Permalink
most asked for changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ElusiveCoin committed Jan 12, 2025
1 parent 05aa54d commit e3b8ab1
Show file tree
Hide file tree
Showing 21 changed files with 116 additions and 133 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ 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
chat-speech-verb-chitinid-4 = buzzes
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_DV/species/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
species-name-vulpkanin = Vulpkanin
species-name-harpy = Harpy
species-name-rodentia = Rodentia
species-name-chitinid = Chitinid
species-name-chitinid = Chitinid
3 changes: 2 additions & 1 deletion Resources/Prototypes/_DV/Body/Organs/chitinid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@
metabolizerTypes: [Human]
groups:
- id: Food
- id: Drink
- id: Drink

34 changes: 13 additions & 21 deletions Resources/Prototypes/_DV/Body/Parts/chitinid.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartChitinid
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:
Expand All @@ -17,10 +19,9 @@
- type: entity
id: TorsoChitinid
name: "chitinid torso"
parent: [PartChitinid, BaseTorso]
parent: [PartChitinidBase, BaseTorso]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "torso_m"
- type: Extractable
juiceSolution:
Expand All @@ -34,10 +35,9 @@
- type: entity
id: HeadChitinid
name: "chitinid head"
parent: [PartChitinid, BaseHead]
parent: [PartChitinidBase, BaseHead]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "head_m"
- type: Extractable
juiceSolution:
Expand All @@ -50,71 +50,63 @@
- type: entity
id: LeftArmChitinid
name: "left chitinid arm"
parent: [PartChitinid, BaseLeftArm]
parent: [PartChitinidBase, BaseLeftArm]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "l_arm"

- type: entity
id: RightArmChitinid
name: "right chitinid arm"
parent: [PartChitinid, BaseRightArm]
parent: [PartChitinidBase, BaseRightArm]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "r_arm"

- type: entity
id: LeftHandChitinid
name: "left chitinid hand"
parent: [PartChitinid, BaseLeftHand]
parent: [PartChitinidBase, BaseLeftHand]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "l_hand"

- type: entity
id: RightHandChitinid
name: "right chitinid hand"
parent: [PartChitinid, BaseRightHand]
parent: [PartChitinidBase, BaseRightHand]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "r_hand"

- type: entity
id: LeftLegChitinid
name: "left chitinid leg"
parent: [PartChitinid, BaseLeftLeg]
parent: [PartChitinidBase, BaseLeftLeg]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "l_leg"

- type: entity
id: RightLegChitinid
name: "right chitinid leg"
parent: [PartChitinid, BaseRightLeg]
parent: [PartChitinidBase, BaseRightLeg]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "r_leg"

- type: entity
id: LeftFootChitinid
name: "left chitinid foot"
parent: [PartChitinid, BaseLeftFoot]
parent: [PartChitinidBase, BaseLeftFoot]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "l_foot"

- type: entity
id: RightFootChitinid
name: "right chitinid foot"
parent: [PartChitinid, BaseRightFoot]
parent: [PartChitinidBase, BaseRightFoot]
components:
- type: Sprite
sprite: _DV/Mobs/Species/Chitinid/parts.rsi
state: "r_foot"
3 changes: 1 addition & 2 deletions Resources/Prototypes/_DV/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@
Piercing: 1.25
Slash: 0.9
Cold: 1.1
Poison: 0.8
Radiation: 0.2
Radiation: 0.2
60 changes: 30 additions & 30 deletions Resources/Prototypes/_DV/Datasets/Names/chitinid_first_female.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
- type: dataset
id: names_chitinid_first_female
id: Names_Chitinid_First_Female
values:
- Heket
- Orchid
- Angel
- Aurora
- Bell
- Bianca
- Daisy
- Daphne
- Maggie
- Lottie
- Dawn
- Diana
- Emma
- Franky
- Gurtrude
- Heket
- Iris
- Petunia
- Isabella
- Jessica
- Kale
- Lottie
- Lucy
- Luna
- Luna
- Penny
- Maggie
- Maple
- Kale
- Bell
- Rosie
- Scarlet
- Diana
- Tracy
- Gurtrude
- Maranda
- Olivia
- Nell
- Jessica
- Aurora
- Isabella
- Selene
- Luna
- Angel
- Sandy
- Sophia
- Emma
- Daisy
- Dawn
- Bianca
- Lucy
- Olivia
- Orchid
- Penny
- Petunia
- Rosie
- Ruby
- Winnona
- Sandy
- Scarlet
- Selene
- Silva
- Franky
- Sophia
- Tess
- Tracy
- Winnona
62 changes: 31 additions & 31 deletions Resources/Prototypes/_DV/Datasets/Names/chitinid_first_male.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
- type: dataset
id: names_chitinid_first_male
id: Names_Chitinid_First_Male
values:
- Drew
- Alvis
- Ash
- Atlas
- Loaf
- Bailey
- Barabosa
- Daedalus
- Drew
- Dusty
- Gambit
- Henley
- Hugo
- Huxley
- Isaac
- Ivar
- Tripp
- Virgil
- Watson
- Wesker
- Ash
- Walker
- Johnny
- Kaiser
- Rex
- Leshy
- Yarrow
- Huxley
- Daedalus
- Hugo
- Zion
- Zayn
- Martin
- Henley
- Loaf
- Loki
- Lucifer
- Lucious
- Martin
- Merlin
- Alvis
- Wolford
- Loki
- Barabosa
- Dusty
- Gambit
- Johnny
- Silver
- Timothy
- Odin
- Rex
- Riley
- Isaac
- Bailey
- Samuel
- Odin
- Lucious
- Silver
- Simon
- Timothy
- Tripp
- Virgil
- Walker
- Watson
- Wesker
- Wolford
- Yarrow
- Zayn
- Zion
36 changes: 18 additions & 18 deletions Resources/Prototypes/_DV/Datasets/Names/chitinid_last.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
- type: dataset
id: names_chitinid_last
id: Names_Chitinid_Last
values:
- Ambervain
- Antonia
- Sassafras
- Antwan
- Hawthorn
- Farreed
- Echeveria
- Cottonwood
- Ashclaw
- Barkfang
- Caladium
- Cottonwood
- Echeveria
- Farreed
- Figbar
- Hollybell
- Wood
- Mossclaw
- Lichen
- Hawthorn
- Hiveborn
- Ichorclaw
- Hiveguard
- Stingroot
- Hollybell
- Ichorclaw
- Leafcarver
- Lichen
- Marshroom
- Mossclaw
- Pollencrest
- Sandtooth
- Ambervain
- Ashclaw
- Barkfang
- Wormwood
- Sassafras
- Soilguard
- Stingroot
- Thistletongue
- Wood
- Woodcrest
- Marshroom
- Soilguard
- Wormwood
13 changes: 2 additions & 11 deletions Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
color: "#ff7a00"
autoRot: true

- type: Carriable # Carrying system from nyanotrasen.
- type: Carriable

- type: Icon
sprite: Mobs/Species/Chitinid/parts.rsi
Expand All @@ -36,9 +36,6 @@
damageContainer: Biological
damageModifierSet: Chitinid

- type: ZombieAccentOverride
accent: zombie

- type: Speech
speechVerb: Chitinid
allowedEmotes: ['Chitter', 'Click', 'Hiss']
Expand Down Expand Up @@ -100,7 +97,7 @@
Cold : 1.25 #per second, scales with temperature & other constants
heatDamage:
types:
Heat : 1.0 #per second, scales with temperature & other constants # DeltaV: changed to normal heat damage
Heat : 1.0 #per second, scales with temperature & other constants
- type: TemperatureSpeed
thresholds:
289: 0.6
Expand Down Expand Up @@ -151,12 +148,6 @@
sprite: "Effects/creampie.rsi"
state: "creampie_moth"
visible: false

- type: Oni # Thank you Oni for so much :3
modifiers:
coefficients:
Blunt: 1.1
Slash: 1.1

- type: entity
parent: BaseSpeciesDummy
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_DV/Species/chitinid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
markingLimits: MobChitinidMarkingLimits
dollPrototype: MobChitinidDummy
skinColoration: Hues
maleFirstNames: names_chitinid_first_male
femaleFirstNames: names_chitinid_first_female
lastNames: names_chitinid_last
maleFirstNames: Names_Chitinid_First_Male
femaleFirstNames: Names_Chitinid_First_Female
lastNames: Names_Chitinid_Last

- type: speciesBaseSprites
id: MobChitinidSprites
Expand Down
Loading

0 comments on commit e3b8ab1

Please sign in to comment.