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.

Sign up for GitHub

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

surgery and shitmed tweaks #2721

Merged
merged 26 commits into from
Jan 16, 2025
+63 −51
Merged

surgery and shitmed tweaks #2721

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b1e62f1
surgery 2
Lyndomen Jan 14, 2025
1eaf914
Update chemist.yml
Lyndomen Jan 14, 2025
c99337d
Update chemist.yml
Lyndomen Jan 14, 2025
3376b36
Update chief_medical_officer.yml
Lyndomen Jan 14, 2025
2cd5002
Update medical_doctor.yml
Lyndomen Jan 14, 2025
d3065c3
Update paramedic.yml
Lyndomen Jan 14, 2025
eeaa347
Update surgeon.yml
Lyndomen Jan 14, 2025
aa48cc2
Update surgery_steps.yml
Lyndomen Jan 14, 2025
b525683
Update belts.yml
Lyndomen Jan 14, 2025
bd59bf9
limbs
Lyndomen Jan 15, 2025
c6906e3
comment ops
Lyndomen Jan 15, 2025
21c1606
Update Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
Lyndomen Jan 15, 2025
5a6007c
Update Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
Lyndomen Jan 15, 2025
9b309f0
Update chemist.yml
Lyndomen Jan 16, 2025
e26f372
Update chemist.yml
Lyndomen Jan 16, 2025
ad897af
Update chief_medical_officer.yml
Lyndomen Jan 16, 2025
2c8c18c
Update surgeon.yml
Lyndomen Jan 16, 2025
92f9fa2
maybe ops
Lyndomen Jan 16, 2025
ab5fa3f
whitespace
Lyndomen Jan 16, 2025
3dda27c
ples
Lyndomen Jan 16, 2025
bf7569d
Update base.yml
Lyndomen Jan 16, 2025
cb806ad
Update vox.yml
Lyndomen Jan 16, 2025
17466cb
Update vulpkanin.yml
Lyndomen Jan 16, 2025
f0fb78c
Update rodentia.yml
Lyndomen Jan 16, 2025
cc82b50
Update chief_medical_officer.yml
Lyndomen Jan 16, 2025
d66ccda
Merge branch 'master' into surgery-2
Lyndomen Jan 16, 2025
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
8 changes: 4 additions & 4 deletions Resources/Prototypes/Body/Parts/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 110
damage: 150 # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Slash
damage: 150
damage: 100 # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 200
damage: 2000 # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down Expand Up @@ -85,7 +85,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 400
damage: 4000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Body/Parts/vox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 110
damage: 150 #DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Slash
damage: 150
damage: 100 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 200
damage: 2000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down Expand Up @@ -106,7 +106,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 400
damage: 4000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: job-name-chemist
description: job-description-chemist
playTimeTracker: JobChemist
antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight.
antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight.
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
requirements:
- !type:DepartmentTimeRequirement
department: Medical
Expand All @@ -15,12 +15,12 @@
- Medical
- Chemistry
- Maintenance
# Shitmed Change
special:
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 1.75
# Shitmed Change, begin DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
# special:
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75 - end DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved

- type: startingGear
id: ChemistGear
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
components:
- type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic.
flatBonus: 0.025
# Shitmed Change
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 2.5
# Shitmed Change. DeltaV - role modifiers bad
#- !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 2.5

- type: startingGear
id: CMOGear
Expand Down
16 changes: 9 additions & 7 deletions Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
- Maintenance
extendedAccess:
- Chemistry
- Paramedic # DeltaV - Add Paramedic access
- Surgery # DeltaV - Add Surgery access
special: # Shitmed change
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 1.75
# Begin DeltaV changes
- Paramedic # Add Paramedic access
- Surgery # Add Surgery access
#special: Shitmed change
#- !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75
# End DeltaV

- type: startingGear
id: DoctorGear
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
access:
- Medical
- Maintenance
special: # Shitmed change
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 1.5
#special: # Shitmed change. DeltaV - role modifiers bad
#- !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.5

- type: startingGear
id: MedicalInternGear
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
- Paramedic # DeltaV - Add Paramedic access
extendedAccess:
- Chemistry
special: # Shitmed change
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 1.75
# special: # DeltaV - role modifiers bad
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75

- type: startingGear
id: ParamedicGear
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_DV/Body/Parts/harpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 110
damage: 150 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Slash
damage: 150
damage: 100 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 200
damage: 2000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down Expand Up @@ -90,7 +90,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 400
damage: 4000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_DV/Body/Parts/rodentia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 110
damage: 150 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Slash
damage: 150
damage: 100 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 200
damage: 2000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down Expand Up @@ -92,7 +92,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 400
damage: 4000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 110
damage: 150 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Slash
damage: 150
damage: 100 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
!type:DamageTypeTrigger
damageType: Heat
damage: 200
damage: 2000 # DeltaV
behaviors:
- !type:SpawnEntitiesBehavior
spawnInContainer: true
Expand Down Expand Up @@ -81,7 +81,7 @@
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
damage: 400
damage: 4000 # DeltaV
behaviors:
- !type:GibPartBehavior { }
- trigger:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
- type: StorageFill
contents:
- id: Cautery
- id: Scalpel
- id: ScalpelAdvanced
- id: Retractor
- id: Hemostat
- id: Bonesetter
Expand Down
11 changes: 5 additions & 6 deletions Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
- Medical
- Surgery
- Maintenance
special:
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 2.0

#special: DeltaV role modifiers bad
#- !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 2.0
- type: startingGear
id: SurgeonGear
equipment:
Expand Down
26 changes: 18 additions & 8 deletions Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
- type: SurgeryDamageChangeEffect
damage:
types:
Bloodloss: 10
Slash: 3 # DeltaV
#Bloodloss: 10 # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
Slash: 12 # DeltaV
Lyndomen marked this conversation as resolved.
Show resolved Hide resolved
sleepModifier: 0.5
- type: SurgeryStepEmoteEffect

Expand All @@ -45,7 +45,7 @@
- type: SurgeryDamageChangeEffect
damage:
types:
Bloodloss: -5
Bloodloss: -3 # DeltaV
sleepModifier: 2

- type: entity
Expand All @@ -66,7 +66,7 @@
- type: SurgeryDamageChangeEffect # DeltaV
damage:
types:
Slash: 2
Slash: 4
Radezolid marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: SurgeryStepBase
Expand Down Expand Up @@ -106,9 +106,10 @@
sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi
state: retractor
- type: SurgeryDamageChangeEffect # DeltaV
sleepModifier: 0.25 # Highly invasive, large damage if the patient is wriggling around
damage:
types:
Blunt: 10
Blunt: 15
Radezolid marked this conversation as resolved.
Show resolved Hide resolved

#- type: entity
# parent: SurgeryStepBase
Expand Down Expand Up @@ -350,7 +351,7 @@
- type: SurgeryDamageChangeEffect # DeltaV
damage:
types:
Slash: 2
Slash: 4
Radezolid marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: SurgeryStepBase
Expand All @@ -368,7 +369,7 @@
- type: SurgeryTendWoundsEffect
damage:
groups:
Brute: -5
Brute: -3 # DeltaV: was -5
- type: SurgeryRepeatableStep

- type: entity
Expand All @@ -389,6 +390,10 @@
damage:
groups:
Burn: -5
- type: SurgeryDamageChangeEffect # DeltaV
damage:
types:
Slash: 2
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
- type: SurgeryRepeatableStep

- type: entity
Expand Down Expand Up @@ -468,7 +473,7 @@
- type: SurgeryRemoveOrganStep
- type: SurgeryStepEmoteEffect
- type: SurgeryDamageChangeEffect # DeltaV
sleepModifier: 0.1 # Maints organ transplants are BAD
sleepModifier: 0.15 # Maints organ transplants are BAD
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
damage:
types:
Slash: 50
Expand All @@ -488,6 +493,11 @@
state: insertion
- type: SurgeryAddOrganStep
- type: SurgeryStepEmoteEffect
- type: SurgeryDamageChangeEffect # DeltaV
sleepModifier: 0.5
damage:
types:
Blunt: 5
Radezolid marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: SurgeryStepInsertOrgan
Expand Down
Loading