Skip to content

Commit

Permalink
Drask (#28)
Browse files Browse the repository at this point in the history
Перенос драска

no cl

---------

Co-authored-by: Schrödinger <[email protected]>
  • Loading branch information
nixsilvam404 and Schrodinger71 authored Jul 9, 2024
1 parent bfe8bfe commit 91e936e
Show file tree
Hide file tree
Showing 49 changed files with 1,133 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Content.Shared/Humanoid/NamingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public string GetName(string species, Gender? gender = null)
case SpeciesNaming.FirstDashFirst:
return Loc.GetString("namepreset-firstdashfirst",
("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender)));
// Start ADT Tweak: Drask naming
case SpeciesNaming.FirstDashFirstDashFirst:
return Loc.GetString("namepreset-firstdashfirstdashfirst",
("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender)), ("first3", GetFirstName(speciesProto, gender)));
// End ADT Tweak
case SpeciesNaming.FirstLast:
default:
return Loc.GetString("namepreset-firstlast",
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,8 @@ public enum SpeciesNaming : byte
First,
FirstLast,
FirstDashFirst,
// ADT Start tweak: Drask naming
FirstDashFirstDashFirst,
// ADT End tweak
TheFirstofLast,
}
Binary file added Resources/Audio/ADT/Drask/draskcough.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Drask/draskscream.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Drask/drasksneeze.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Drask/drasktalk.ogg
Binary file not shown.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/species/namepreset.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namepreset-first = {$first}
namepreset-firstlast = {$first} {$last}
namepreset-firstdashfirst = {$first1}-{$first2}
# Start ADT tweak: Drask
namepreset-firstdashfirstdashfirst = { $first1 }-{ $first2 }-{ $first3 }
# End ADT tweak
namepreset-thefirstoflast = The {$first} of {$last}
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ metabolizer-type-plant = Растение
metabolizer-type-dwarf = Дварф
metabolizer-type-moth = Ниан
metabolizer-type-arachnid = Арахнид
metabolizer-type-drask = Драск
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/drask.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MobDrask = { ent-BaseMobDrask }
.desc = { ent-BaseMobDrask.desc }
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/drask.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-BaseMobDrask = Урист МакДраск
.desc = { ent-BaseMobSpeciesOrganic.desc }
.suffix = Драск
ent-MobDraskDummy = { ent-BaseSpeciesDummy }
.desc = { ent-BaseSpeciesDummy.desc }
13 changes: 13 additions & 0 deletions Resources/Locale/ru-RU/ADT/Species/drask.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
species-name-drask = Драск
marking-DraskArmRight = правая рука
marking-DraskArmLeft = левая рука
ent-OrganDraskEyes = глаза
.desc = Я тебя вижу!
ent-OrganDraskLungs = лёгкие
.desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов.
ent-OrganDraskHeart = сердце
.desc = Мне жаль того бессердечного ублюдка, который его потерял.
ent-OrganDraskInnards = внутренности
.desc = Мерзость.
ent-OrganDraskKidneys = почки
.desc = Выводят токсины из кровеносной системы.
103 changes: 103 additions & 0 deletions Resources/Prototypes/ADT/Body/Organs/Drask.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
- type: entity
id: OrganDraskEyes
parent: BaseHumanOrgan
suffix: "drask"
name: eyes
description: "I see you!"
components:
- type: Sprite
sprite: ADT/Mobs/Drask/organs.rsi
state: eyes

- type: entity
id: OrganDraskLungs
parent: BaseHumanOrgan
suffix: "drask"
name: lungs
description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
components:
- type: Sprite
sprite: ADT/Mobs/Drask/organs.rsi
state: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true
solutionOnBody: false
solution: "Lung"
metabolizerTypes: [ Drask ]
groups:
- id: Gas
rateModifier: 100.0
- type: SolutionContainerManager
solutions:
organ:
reagents:
- ReagentId: Nutriment
Quantity: 10
Lung:
maxVol: 100.0
canReact: false
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5

- type: entity
id: OrganDraskHeart
parent: BaseHumanOrgan
suffix: "drask"
name: heart
description: "I feel bad for the heartless bastard who lost this."
components:
- type: Sprite
sprite: ADT/Mobs/Drask/organs.rsi
state: heart_on
- type: Metabolizer
maxReagents: 2
metabolizerTypes: [ Drask ]
groups:
- id: Medicine
- id: Poison
- id: Narcotic

- type: entity
id: OrganDraskInnards
parent: BaseHumanOrgan
suffix: "drask"
name: innards
description: "Ew innards."
components:
- type: Sprite
sprite: ADT/Mobs/Drask/organs.rsi
state: innards
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Stomach
- type: Metabolizer
maxReagents: 3
metabolizerTypes: [ Drask ]
groups:
- id: Food
- id: Drink

- type: entity
id: OrganDraskKidneys
parent: BaseHumanOrgan
suffix: "drask"
name: kidneys
components:
- type: Sprite
sprite: ADT/Mobs/Drask/organs.rsi
state: kidneys
- type: Metabolizer
maxReagents: 5
metabolizerTypes: [ Drask ]
removeEmpty: true
190 changes: 190 additions & 0 deletions Resources/Prototypes/ADT/Body/Parts/Drask.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartDrask
parent: BaseItem
name: "drask body part"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []

- type: entity
id: TorsoDrask
name: "drask torso"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "torso_m"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso

- type: entity
id: HeadDrask
name: "drask head"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "head_m"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "head_m"
- type: BodyPart
partType: Head
vital: true
- type: Input
context: "ghost"
- type: MovementSpeedModifier
baseWalkSpeed: 0
baseSprintSpeed: 0
- type: InputMover
- type: GhostOnMove
- type: Tag
tags:
- Head

- type: entity
id: LeftArmDrask
name: "left drask arm"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_arm"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
symmetry: Left

- type: entity
id: RightArmDrask
name: "right drask arm"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_arm"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
symmetry: Right

- type: entity
id: LeftHandDrask
name: "left drask hand"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_hand"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
symmetry: Left

- type: entity
id: RightHandDrask
name: "right drask hand"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_hand"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
symmetry: Right

- type: entity
id: LeftLegDrask
name: "left drask leg"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_leg"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
symmetry: Left
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: RightLegDrask
name: "right drask leg"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_leg"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
symmetry: Right
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: LeftFootDrask
name: "left drask foot"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_foot"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
symmetry: Left

- type: entity
id: RightFootDrask
name: "right drask foot"
parent: PartDrask
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_foot"
- type: Icon
sprite: ADT/Mobs/Drask/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
symmetry: Right
Loading

0 comments on commit 91e936e

Please sign in to comment.