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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+46 −37
Open

surgery and shitmed tweaks #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 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
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
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, DeltaV role modifiers bad
# special:
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick here too,


- 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
Comment on lines +48 to +52
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick


- type: startingGear
id: CMOGear
Expand Down
10 changes: 5 additions & 5 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 @@ -17,11 +17,11 @@
- Chemistry
- Paramedic # DeltaV - Add Paramedic access
- Surgery # DeltaV - Add Surgery access
special: # Shitmed change
- !type:AddComponentSpecial
components:
- type: SurgerySpeedModifier
speedModifier: 1.75
# special: # Shitmed change, DeltaV role modifiers bad
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75
Comment on lines +20 to +24
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick


- type: startingGear
id: DoctorGear
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: # Shitmed change, DeltaV role modifiers bad
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.75
Comment on lines +26 to +30
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, nitpick.


- type: startingGear
id: ParamedicGear
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: Shitmed, DeltaV role modifiers bad
# - !type:AddComponentSpecial
# components:
# - type: SurgerySpeedModifier
# speedModifier: 1.5
Comment on lines +17 to +21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a nitpick but, comment should begin at the indentation line that it's changing.

- 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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont think this even works right tbh. sleeping and not is weird

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, i did some quick testing and it always applies the 0.5 modification.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it might be only checking for one damage value, but i bumped up slash anyway

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