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

[Feature] Advanced Body Bags / Продвинутые Мешки для Тел #120

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Resources/Locale/en-US/_white/catalog/fills/boxes/medical.ftl
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-BoxBodyBagBluespace = bluespace body bag box
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagNanoTrasen = NanoTrasen body bag box
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagPrisoner = prisoner body bag box
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagRadiation = radiation body bag box
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagSyndicate = red body bag box
.desc = { ent-BoxBodyBag.desc }
Spatison marked this conversation as resolved.
Show resolved Hide resolved
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
ent-BodyBagBluespace = body bag bluespace
.desc = Durable bluespace bag designed for storing and transporting corpses, preventing decomposition.
ent-BodyBagBluespaceFolded = { ent-BodyBagBluespace }
.desc = { ent-BodyBagBluespace.desc }
.suffix = Folded
Spatison marked this conversation as resolved.
Show resolved Hide resolved
ent-BodyBagNanoTrasen = blue body bag
.desc = Plastic NT bag designed for storing and transporting corpses, preventing decomposition.
.suffix = NT
ent-BodyBagNanoTrasenFolded = { ent-BodyBagNanoTrasen }
.desc = { ent-BodyBagNanoTrasen.desc }
.suffix = Folded, NT
ent-BodyBagPrisoner = prisoner body bag
.desc = Plastic bag designed for storing and transporting corpses, preventing decomposition in prison structures.
ent-BodyBagPrisonerFolded = { ent-BodyBagPrisoner }
.desc = { ent-BodyBagPrisoner.desc }
.suffix = Folded
ent-BodyBagRadiation = radiation body bag
.desc = Plastic bag designed for storing and transporting radioactive corpses, preventing decomposition.
ent-BodyBagRadiationFolded = { ent-BodyBagRadiation }
.desc = { ent-BodyBagRadiation.desc }
.suffix = Folded
Spatison marked this conversation as resolved.
Show resolved Hide resolved
ent-BodyBagSyndicate = red body bag
.desc = Plastic bag with Syndicate symbols, designed for storing and transporting corpses, preventing decomposition.
.suffix = Syndicate
ent-BodyBagSyndicateFolded = { ent-BodyBagSyndicate }
.desc = { ent-BodyBagSyndicate.desc }
.suffix = Folded, Syndicate
Spatison marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 10 additions & 0 deletions Resources/Locale/ru-RU/_white/catalog/fills/boxes/medical.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-BoxBodyBagBluespace = коробка блюспейс мешков для тел
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagNanoTrasen = коробка НТ мешков для тел
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagPrisoner = коробка тюремных мешков для тел
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagRadiation = коробка противорадиационных мешков для тел
.desc = { ent-BoxBodyBag.desc }
ent-BoxBodyBagSyndicate = коробка красных мешков для тел
.desc = { ent-BoxBodyBag.desc }
27 changes: 27 additions & 0 deletions Resources/Locale/ru-RU/_white/object/specific/medical/bodybags.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
ent-BodyBagBluespace = блюспейс мешок для тела
.desc = Прочный блюспейс мешок, предназначенный для хранения и транспортировки трупов, и предотвращения их гниения.
ent-BodyBagBluespaceFolded = { ent-BodyBagBluespace }
.desc = { ent-BodyBagBluespace.desc }
.suffix = Сложенный
ent-BodyBagNanoTrasen = синий мешок для тела
.desc = Пластиковый мешок НТ, предназначенный для хранения и транспортировки трупов, и предотвращения их гниения.
.suffix = НТ
ent-BodyBagNanoTrasenFolded = { ent-BodyBagNanoTrasen }
.desc = { ent-BodyBagNanoTrasen.desc }
.suffix = Сложенный, НТ
ent-BodyBagPrisoner = тюремный мешок для тела
.desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов, и предотвращения их гниения в тюремных структурах.
ent-BodyBagPrisonerFolded = { ent-BodyBagPrisoner }
.desc = { ent-BodyBagPrisoner.desc }
.suffix = Сложенный
ent-BodyBagRadiation = противорадиационный мешок для тела
.desc = Пластиковый мешок, предназначенный для хранения и транспортировки радиоактивных трупов, и предотвращения их гниения.
ent-BodyBagRadiationFolded = { ent-BodyBagRadiation }
.desc = { ent-BodyBagRadiation.desc }
.suffix = Сложенный
ent-BodyBagSyndicate = красный мешок для тела
.desc = Пластиковый мешок с символикой Синдиката, предназначенный для хранения и транспортировки трупов, и предотвращения их гниения.
.suffix = Синдикат
ent-BodyBagSyndicateFolded = { ent-BodyBagSyndicate }
.desc = { ent-BodyBagSyndicate.desc }
.suffix = Сложенный, Синдикат
Spatison marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: BoxBodyBagRadiation # WD

- type: entity
id: LockerResearchDirectorFilled
Expand All @@ -292,6 +293,7 @@
- id: EncryptionKeyBinary
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: BoxBodyBagRadiation # WD

- type: entity
id: LockerHeadOfSecurityFilledHardsuit
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- id: BoxEncryptionKeyPrisoner #Delta-V
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3
- id: BoxBodyBagPrisoner # WD

- type: entity
id: LockerWardenFilled
Expand Down Expand Up @@ -54,6 +55,7 @@
- id: BoxEncryptionKeyPrisoner #Delta-V
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3
- id: BoxBodyBagPrisoner # WD

- type: entity
id: LockerSecurityFilled
Expand Down Expand Up @@ -137,6 +139,7 @@
## prob: 0.15
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3
- id: BoxBodyBagPrisoner # WD

# DeltaV - adding corpsman locker w/ hardsuit

Expand Down Expand Up @@ -170,6 +173,7 @@
prob: 0.7
- id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
prob: 0.3
- id: BoxBodyBagPrisoner # WD

# DeltaV - end addition

Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,13 @@
- ClothingEyesHudMedical # Nyano
- ChemicalPayload # Nyano
- SyringeCryostasis
- BluespaceBodyBag # WD
- NTBodyBag # WD
- PrisonerBodyBag # WD
- RadiationBodyBag # WD
- type: EmagLatheRecipes
emagDynamicRecipes:
- SyndicateBodyBag # WD
- type: Machine
board: MedicalTechFabCircuitboard
- type: StealTarget
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Research/civilianservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@
- CryoPodMachineCircuitboard
- CryostasisBeaker
- SyringeCryostasis
- NTBodyBag # WD
- PrisonerBodyBag # WD
- RadiationBodyBag # WD

- type: technology
id: MechanizedTreatment
Expand Down Expand Up @@ -229,6 +232,7 @@
recipeUnlocks:
- BluespaceBeaker
- SyringeBluespace
- BluespaceBodyBag # WD

- type: technology
id: BasicTranslation
Expand Down
89 changes: 89 additions & 0 deletions Resources/Prototypes/_White/Catalog/Fills/Boxes/medical.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
- type: entity
parent: BoxCardboard
id: BoxBodyBagBluespace
name: bluespace body bag box
description: Contains body bags.
components:
- type: StorageFill
contents:
- id: BodyBagBluespaceFolded
amount: 4
- type: Sprite
layers:
- state: box
- state: bodybags
whitelist:
tags:
- BodyBag

- type: entity
parent: BoxCardboard
id: BoxBodyBagNanoTrasen
name: NanoTrasen body bag box
description: Contains body bags.
components:
- type: StorageFill
contents:
- id: BodyBagNanoTrasenFolded
amount: 4
- type: Sprite
layers:
- state: box
- state: bodybags
whitelist:
tags:
- BodyBag

- type: entity
parent: BoxCardboard
id: BoxBodyBagPrisoner
name: prisoner body bag box
description: Contains body bags.
components:
- type: StorageFill
contents:
- id: BodyBagPrisonerFolded
amount: 4
- type: Sprite
layers:
- state: box
- state: bodybags
whitelist:
tags:
- BodyBag

- type: entity
parent: BoxCardboard
id: BoxBodyBagRadiation
name: radiation body bag box
description: Contains body bags.
components:
- type: StorageFill
contents:
- id: BodyBagRadiationFolded
amount: 4
- type: Sprite
layers:
- state: box
- state: bodybags
whitelist:
tags:
- BodyBag

Spatison marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: BoxCardboard
id: BoxBodyBagSyndicate
name: syndicate body bag box
description: Contains body bags.
components:
- type: StorageFill
contents:
- id: BodyBagSyndicateFolded
amount: 4
- type: Sprite
layers:
- state: box_of_doom
- state: bodybags
whitelist:
tags:
- BodyBag
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: BaseMechEquipment
id: MechEquipmentDrill
name: mech drill
description: Gives the mech the ability to drill.
components:
- type: Sprite
state: mecha_drill
- type: Tag
tags:
- Pickaxe
- type: MeleeWeapon
autoAttack: true
angle: 0
attackRate: 3.5
wideAnimationRotation: -90
soundHit:
path: "/Audio/Items/drill_hit.ogg"
damage:
groups:
Brute: 5
types:
Structural: 15
Spatison marked this conversation as resolved.
Show resolved Hide resolved
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading