Skip to content

Commit

Permalink
Adds Surgeon role & surgical belt (#146)
Browse files Browse the repository at this point in the history
* job added

* wip

* loadout, belt and locale

* TimeRequirement fix

* Update Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml

---------

Co-authored-by: Ko4ergaPunk <[email protected]>
Co-authored-by: AwareFoxy <[email protected]>
  • Loading branch information
3 people authored Dec 15, 2024
1 parent cd14136 commit fc5a222
Show file tree
Hide file tree
Showing 44 changed files with 382 additions and 1 deletion.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_corvaxnext/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-description-surgeon = Masterfully shove the scalpel deep into the poor souls who come... Saving lives, of course!
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_corvaxnext/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-name-surgeon = surgeon
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_corvaxnext/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-description-surgeon = Мастерски пихайте скальпель куда поглубже приходящим бедолагам... Спасая жизни, конечно!
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_corvaxnext/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
job-name-surgeon = хирург
JobSurgeon = хирург
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ loadout-group-brigmedic-head = Бригмедик, голова
loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон
loadout-group-brigmedic-backpack = Бригмедик, верхняя одежда
loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак
# Medical
loadout-group-surgeon-head = Хирург, голова
loadout-group-surgeon-jumpsuit = Хирург, комбинезон
loadout-group-surgeon-scalpel = Хирург, скальпель
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ ent-ClothingBeltWhiteSheath = белые сабельные ножны
.desc = Стиль, блеск, всё для лучших сабель во вселенной.
ent-ClothingBeltSheriffSheath = сабельные ножны шерифа
.desc = Практичность, прочность, сабля точно не окажется в вашей ноге.
ent-ClothingBeltSurgicalBoard = магнитная доска хирурга
.desc = Может магнитить хирургические инструменты, изготовленные на Медицинском ТехФабе. Помощник хирурга? У меня есть свой дружок!
ent-ClothingBeltSurgicalBoardFilled = { ent-ClothingBeltSurgicalBoard }
.desc = { ent-ClothingBeltSurgicalBoard.desc }
.suffix = Заполненный
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
endSound:
path: /Audio/Medical/Surgery/cautery2.ogg
- type: Cautery
- type: Tag
tags:
- SurgeryTool
- Cautery
# end-_CorvaxNext: surgery

# Drill
Expand Down Expand Up @@ -73,6 +77,10 @@
startSound:
path: /Audio/_CorvaxNext/Medical/Surgery/saw.ogg
- type: Drill
- type: Tag
tags:
- SurgeryTool
- Drill
# end-_CorvaxNext: surgery

# Scalpel
Expand Down Expand Up @@ -114,6 +122,10 @@
endSound:
path: /Audio/Medical/Surgery/scalpel2.ogg
- type: Scalpel
- type: Tag
tags:
- SurgeryTool
- Scalpel
# end-_CorvaxNext: surgery


Expand Down Expand Up @@ -164,8 +176,14 @@
sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
storedRotation: 90
heldPrefix: laser
- type: Scalpel # _CorvaxNext
# start-_CorvaxNext: surgery
- type: Scalpel
speed: 1.5
- type: Tag
tags:
- SurgeryTool
- ScalpelLaser
# end-_CorvaxNext: surgery
# TODO: prevent bleeding from incisions

# Retractor
Expand All @@ -189,6 +207,10 @@
endSound:
path: /Audio/Medical/Surgery/retractor2.ogg
- type: Retractor
- type: Tag
tags:
- SurgeryTool
- Retractor
# end-_CorvaxNext: surgery

# Hemostat
Expand All @@ -215,6 +237,10 @@
- type: Hemostat
- type: Tweezers
- type: Tending
- type: Tag
tags:
- SurgeryTool
- Hemostat
# end-_CorvaxNext: surgery

# Bone setter
Expand Down Expand Up @@ -331,6 +357,10 @@
speedModifier: 1.5
- type: BoneSaw
speed: 1.5
- type: Tag
tags:
- SurgeryTool
- SawElectric
# end-_CorvaxNext: surgery

- type: entity
Expand Down Expand Up @@ -389,6 +419,10 @@
speed: 1.5
- type: Drill
speed: 1.5
- type: Tag
tags:
- SurgeryTool
- EnergyCautery

- type: entity
name: energy scalpel
Expand Down Expand Up @@ -420,6 +454,10 @@
speed: 1.5
- type: BoneSaw
speed: 1.5
- type: Tag
tags:
- SurgeryTool
- EnergyScalpel

- type: entity
name: mechanical pinches
Expand Down Expand Up @@ -455,6 +493,10 @@
speed: 1.5
- type: Tending
speed: 1.5
- type: Tag
tags:
- SurgeryTool
- AdvancedRetractor

- type: entity
name: medical multitool
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
- MedicalIntern
- Psychologist
- Paramedic
- Surgeon # Corvax-Next-Surgeon

- type: department
id: Security
Expand Down
82 changes: 82 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,85 @@
state: sheath
- type: Clothing
sprite: _CorvaxNext/Clothing/Belt/sheriff_sheath.rsi

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltSurgicalBoard
name: surgical magnetic board
description: Able to magnetize special surgical instruments made on Medical TechFab. Surgeon's assistant? I have my own little buddy!
components:
- type: Sprite
sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
- type: Clothing
sprite: _CorvaxNext/Clothing/Belt/surgical_board.rsi
- type: Storage
whitelist:
tags:
- Hemostat
- Scalpel
- EnergyScalpel
- ScalpelLaser
- Retractor
- AdvancedRetractor
- Cautery
- EnergyCautery
- Drill
- SawElectric
- type: ItemMapper
mapLayers:
hemostat:
whitelist:
tags:
- Hemostat
scalpel:
whitelist:
tags:
- Scalpel
energyScalpel:
whitelist:
tags:
- EnergyScalpel
scalpelLaser:
whitelist:
tags:
- ScalpelLaser
retractor:
whitelist:
tags:
- Retractor
advancedRetractor:
whitelist:
tags:
- AdvancedRetractor
cautery:
whitelist:
tags:
- Cautery
energyCautery:
whitelist:
tags:
- EnergyCautery
drill:
whitelist:
tags:
- Drill
sawElectric:
whitelist:
tags:
- SawElectric
sprite: _CorvaxNext/Clothing/Belt/belt_overlay.rsi
- type: Appearance

- type: entity
parent: ClothingBeltSurgicalBoard
id: ClothingBeltSurgicalBoardFilled
suffix: Filled
components:
- type: StorageFill
contents:
- id: Hemostat
- id: Scalpel
- id: Retractor
- id: Cautery
- id: Drill
- id: SawElectric
17 changes: 17 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Medical/surgeon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: loadoutEffectGroup
id: SeniorSurgeon
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobSurgeon
time: 187200 # 52 hrs

- type: loadout
id: SurgeonScalpelLaser
effects:
- !type:GroupLoadoutEffect
proto: SeniorSurgeon
storage:
back:
- ScalpelLaser
24 changes: 24 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,27 @@
- BrigmedicOuterClothingCoat
- BrigmedicOuterClothingLab
- BrigmedicOuterClothingVest

# Medical
- type: loadoutGroup
id: SurgeonHead
name: loadout-group-surgeon-head
loadouts:
- BlueSurgeryCap
- GreenSurgeryCap
- PurpleSurgeryCap

- type: loadoutGroup
id: SurgeonJumpsuit
name: loadout-group-surgeon-jumpsuit
loadouts:
- MedicalBlueScrubs
- MedicalGreenScrubs
- MedicalPurpleScrubs

- type: loadoutGroup
id: SurgeonScalpel
name: loadout-group-surgeon-scalpel
minLimit: 0
loadouts:
- SurgeonScalpelLaser
12 changes: 12 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@
- Survival
- Trinkets
- GroupSpeciesBreathTool

- type: roleLoadout
id: JobSurgeon
groups:
- Inventory # Corvax-Loadouts
- SurgeonHead
- SurgeonJumpsuit
- MedicalBackpack
- Survival
- Trinkets
- GroupSpeciesBreathTool
- SurgeonScalpel
26 changes: 26 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: job
id: Surgeon
name: job-name-surgeon
description: job-description-surgeon
playTimeTracker: JobSurgeon
requirements:
- !type:RoleTimeRequirement
role: JobMedicalDoctor
time: 36000 # 10 hrs
startingGear: SurgeonGear
icon: "JobIconSurgeon"
supervisors: job-supervisors-cmo
access:
- Medical
- Maintenance
extendedAccess:
- Chemistry

- type: startingGear
id: SurgeonGear
equipment:
ears: ClothingHeadsetMedical
belt: ClothingBeltSurgicalBoardFilled
shoes: ClothingShoesColorWhite
mask: ClothingMaskSterile
gloves: ClothingHandsGlovesNitrile
3 changes: 3 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
- type: playTimeTracker
id: JobBrigmedic

- type: playTimeTracker
id: JobSurgeon
7 changes: 7 additions & 0 deletions Resources/Prototypes/_CorvaxNext/StatusIcon/job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: jobIcon
parent: JobIcon
id: JobIconSurgeon
icon:
sprite: /Textures/_CorvaxNext/Interface/Misc/job_icons.rsi
state: Surgeon
jobName: job-name-surgeon
30 changes: 30 additions & 0 deletions Resources/Prototypes/_CorvaxNext/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,35 @@
- type: Tag
id: Eyes

- type: Tag
id: Hemostat

- type: Tag
id: Scalpel

- type: Tag
id: EnergyScalpel

- type: Tag
id: ScalpelLaser

- type: Tag
id: Retractor

- type: Tag
id: AdvancedRetractor

- type: Tag
id: Cautery

- type: Tag
id: EnergyCautery

- type: Tag
id: Drill

- type: Tag
id: SawElectric

- type: Tag
id: ArtificialBluespaceCrystal
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fc5a222

Please sign in to comment.