Skip to content

Commit

Permalink
Revert "Merge pull request Simple-Station#11 from Tropica1Owl/Pogmed"
Browse files Browse the repository at this point in the history
This reverts commit 7a326d3, reversing
changes made to 7172fdc.
  • Loading branch information
gluesniffler committed Oct 26, 2024
1 parent e1fd015 commit 98ad0b7
Show file tree
Hide file tree
Showing 20 changed files with 0 additions and 112 deletions.

This file was deleted.

12 changes: 0 additions & 12 deletions Content.Server/Palmtree/Surgery/Components/TendWoundComponent.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Content.Shared/Palmtree/Surgery/SharedSurgery.cs

This file was deleted.

Binary file removed Resources/Audio/Palmtree/Items/Medical/cautery1.ogg
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/cautery2.ogg
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/hemostat1.ogg
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/organ1.ogg
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/organ2.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/saw.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/Palmtree/Items/Medical/scalpel2.ogg
Binary file not shown.
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
- id: Cautery
- id: Retractor
- id: Scalpel
- id: PhantomLinkCard # Syndie change

- type: entity
id: ClothingBackpackDuffelCBURNFilled
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
- id: Saw
- id: Hemostat
- id: ClothingMaskSterile
- id: PhantomLinkCard # Syndie change

- type: entity
id: CrateMedicalScrubs
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,6 @@
description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
abstract: true
components:
- type: PPatient
- type: CombatMode
- type: Inventory
templateId: monkey
Expand Down
55 changes: 0 additions & 55 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@
parent: BaseToolSurgery
description: A surgical tool used to cauterize open wounds.
components:
- type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
useDelay: 1
kind: cautery
audioStart:
path: "/Audio/Palmtree/Items/Medical/cautery1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/cautery2.ogg"
bleedAmountOnUse: -15
damageOnUse:
types:
Heat: 1 # Burns!
- type: Sprite
sprite: Objects/Specific/Medical/Surgery/cautery.rsi
state: cautery
Expand Down Expand Up @@ -83,15 +72,6 @@
parent: BaseToolSurgery
description: A surgical tool used to make incisions into flesh.
components:
- type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
kind: scalpel
audioStart:
path: "/Audio/Palmtree/Items/Medical/scalpel1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
damageOnUse:
types:
Slash: 15 # Chop chop
- type: Sharp
butcherDelayModifier: 1.5 # Butchering with a scalpel, regardless of the type, will take 50% longer
- type: Utensil
Expand Down Expand Up @@ -169,15 +149,6 @@
parent: BaseToolSurgery
description: A surgical tool used to hold open incisions.
components:
- type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
kind: retractor
audioStart:
path: "/Audio/Palmtree/Items/Medical/retractor1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/retractor2.ogg"
damageOnUse: # Ow it pinches
types:
Blunt: 5
- type: Sprite
sprite: Objects/Specific/Medical/Surgery/scissors.rsi
state: retractor
Expand All @@ -191,18 +162,6 @@
parent: Retractor
description: A surgical tool used to compress blood vessels to prevent bleeding.
components:
- type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
useDelay: 1
kind: hemostat # Even if the hemostat is in the same category as a retractor, it is used for different things.
audioStart:
path: "/Audio/Palmtree/Items/Medical/hemostat1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/hemostat1.ogg"
damageOnUse: # Ow it pinches
groups:
Brute: -9
Burn: -12
bleedAmountOnUse: -15
- type: Sprite
state: hemostat
- type: Item
Expand All @@ -223,15 +182,6 @@
parent: BaseToolSurgery
description: For cutting wood and other objects to pieces. Or sawing bones, in case of emergency.
components:
- type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
audioStart:
path: "/Audio/Palmtree/Items/Medical/scalpel1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
kind: saw
damageOnUse:
types:
Blunt: 30 # Having your bones affected gotta hurt a lot
- type: Sharp
- type: Utensil
types:
Expand Down Expand Up @@ -296,11 +246,6 @@
parent: Saw
description: For heavy duty cutting.
components:
- type: PSurgeryTool
audioStart:
path: "/Audio/Palmtree/Items/Medical/saw1.ogg"
audioEnd:
path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
- type: Sprite
state: electric
- type: Item
Expand Down
Binary file not shown.
Binary file not shown.

This file was deleted.

0 comments on commit 98ad0b7

Please sign in to comment.