Adds more surgery tools and resprites existing (#3631)

* Initial * Fixed map/issues * Touchup * Fixes tests * Fixed tests * Fixed RSI Validator * Fixed RSI Validator * Fixed * FD * FD * FD * Killed rogue inis * netsync * Update submodule * Lint * Lint Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-03-16 07:48:54 +00:00
parent e13185a5a8
commit 20fd7bb5a9
92 changed files with 558 additions and 183 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -7,7 +7,7 @@
  - type: StorageFill
    contents:
      - name: Hemostat
-      - name: BoneSaw
+      - name: Saw
      - name: Drill
      - name: Cautery
      - name: Retractor
@@ -22,7 +22,7 @@
  - type: StorageFill
    contents:
      - name: Hemostat
-      - name: BoneSaw
+      - name: Saw
      - name: Drill
      - name: Cautery
      - name: Retractor
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -35,7 +35,7 @@
        amount: 1
      - name: Drill
        amount: 1
-      - name: BoneSaw
+      - name: Saw
        amount: 1
      - name: Hemostat
        amount: 1
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -41,8 +41,8 @@
  id: AdvancedSugery
  description: Research new surgical procedures.
  icon:
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: bone_saw
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
  requiredPoints: 1500
  requiredTechnologies:
    - BiologicalTechnology
@@ -138,7 +138,7 @@
  description: A refresher course on modern engineering technology.
  icon:
    sprite: Constructible/Power/protolathe.rsi
-    state: protolathe
+    state: icon
  requiredPoints: 1000
  requiredTechnologies:
    - BasicResearch
--- a/Resources/Prototypes/Catalog/VendingMachines/robotics.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/robotics.yml
@@ -14,10 +14,9 @@
    #signaller
    #health anaylzer
    Scalpel: 2
-    BoneSaw: 1
+    Saw: 1
    #bonesetter
    #anaesthetic
    #medical mask
    Screwdriver: 5
    Crowbar: 5
-    
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -5,7 +5,7 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/bodybags.rsi
+    sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
    layers:
    - state: bag
    - state: open_overlay
@@ -13,7 +13,7 @@
    - state: label_overlay
      map: ["enum.BodyBagVisualLayers.Label"]
  - type: Icon
-    sprite: Objects/Specific/Morgue/bodybags.rsi
+    sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
    state: bag
  - type: Clickable
  - type: InteractionOutline
@@ -48,14 +48,13 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/bodybags.rsi
+    sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
    state: item
 #  - type: BodyBagItem #TODO: we need some kind of generic placable, like thus:
 # - type: Placeable
 #   prototype: someId
 #   snap: Center

-
 - type: entity
  id: Morgue
  name: morgue
@@ -63,7 +62,7 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/morgue.rsi
+    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
    layers:
    - state: morgue_closed
      map: ["enum.MorgueVisualLayers.Base"]
@@ -115,7 +114,7 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/morgue.rsi
+    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
    state: morgue_tray
  - type: Clickable
  - type: InteractionOutline
@@ -138,7 +137,7 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/morgue.rsi
+    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
    layers:
    - state: crema_closed
      map: ["enum.CrematoriumVisualLayers.Base"]
@@ -191,7 +190,7 @@
  components:
  - type: Sprite
    netsync: false
-    sprite: Objects/Specific/Morgue/morgue.rsi
+    sprite: Objects/Specific/Medical/Morgue/morgue.rsi
    state: crema_tray

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -1,102 +1,249 @@
+# Base
+
 - type: entity
  parent: BaseItem
-  id: BaseSurgeryTool
+  id: BaseToolSurgery
  abstract: true
  components:
-  - type: SurgeryTool
-    surgeryType: Incision
-    baseOperateTime: 5
+  - type: Sprite
+    netsync: false
  - type: UserInterface
    interfaces:
    - key: enum.SurgeryUIKey.Key
      type: SurgeryBoundUserInterface

- type: entity
-  name: scalpel
-  parent: BaseSurgeryTool
-  id: Scalpel
-  description: A surgical tool used to make incisions into flesh.
-  components:
-  - type: SurgeryTool
-    surgeryType: Incision
-    baseOperateTime: 3
-  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: scalpel
-  - type: ItemCooldown
-  - type: MeleeWeapon
-
- type: entity
-  name: retractor
-  parent: BaseSurgeryTool
-  id: Retractor
-  description: A surgical tool used to hold open incisions.
-  components:
-  - type: SurgeryTool
-    surgeryType: Retraction
-    baseOperateTime: 3
-  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: retractor
-  - type: ItemCooldown
-  - type: MeleeWeapon
+# Cautery

 - type: entity
  name: cautery
-  parent: BaseSurgeryTool
  id: Cautery
+  parent: BaseToolSurgery
  description: A surgical tool used to cauterize open wounds.
  components:
  - type: SurgeryTool
    surgeryType: Cauterization
    baseOperateTime: 3
  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
    state: cautery
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
  - type: ItemCooldown
-  - type: MeleeWeapon
+
+# Drill

 - type: entity
  name: drill
-  parent: BaseSurgeryTool
  id: Drill
+  parent: BaseToolSurgery
  description: A surgical drill for making holes into hard material.
  components:
+#  - type: PowerCellSlot
  - type: SurgeryTool
    surgeryType: Drilling
    baseOperateTime: 3
  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
    state: drill
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    hitSound: /Audio/Items/drill_hit.ogg
+
+# Scalpel

 - type: entity
-  name: bone saw
-  parent: BaseSurgeryTool
-  id: BoneSaw
-  description: A surgical tool used for amputations.
+  name: scalpel
+  id: Scalpel
+  parent: BaseToolSurgery
+  description: A surgical tool used to make incisions into flesh.
  components:
+  - type: Utensil
+    types:
+      - Knife
  - type: SurgeryTool
-    surgeryType: Amputation
-    baseOperateTime: 3
+    surgeryType: Incision
+    baseOperateTime: 5
  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
-    state: bone_saw
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
+    state: scalpel
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    hitSound: /Audio/Weapons/bladeslice.ogg
+    damage: 12
+
+- type: entity
+  name: shiv
+  id: ScalpelShiv
+  parent: Scalpel
+  description: A pointy piece of glass, abraded to an edge and wrapped in tape for a handle. # Could become a decent tool or weapon with right tool mods.
+  components:
+  - type: SurgeryTool
+    surgeryType: Incision
+    baseOperateTime: 8
+  - type: Sprite
+    state: shiv
+  - type: Item
+    HeldPrefix: shiv
+
+- type: entity
+  name: advanced scalpel
+  id: ScalpelAdvanced
+  parent: Scalpel
+  description: Made of more expensive materials, sharper and generally more reliable.
+  components:
+  - type: SurgeryTool
+    surgeryType: Incision
+    baseOperateTime: 4
+  - type: Sprite
+    state: advanced
+  - type: Item
+    HeldPrefix: advanced
+
+- type: entity
+  name: laser scalpel
+  id: ScalpelLaser
+  parent: Scalpel
+  description: A scalpel which uses a directed laser to slice instead of a blade, for more precise surgery while also cauterizing as it cuts.
+  components:
+#  - type: PowerCellSlot
+  - type: SurgeryTool
+    surgeryType: Incision
+    baseOperateTime: 2
+  - type: Sprite
+    state: laser
+  - type: Item
+    HeldPrefix: laser
+
+# Scissors
+
+- type: entity
+  name: retractor
+  id: Retractor
+  parent: BaseToolSurgery
+  description: A surgical tool used to hold open incisions.
+  components:
+  - type: SurgeryTool
+    surgeryType: Retraction
+    baseOperateTime: 3
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+    state: retractor
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
+  - type: ItemCooldown
+# Would do this, but inhands don't change. Also doesn't work for SurgeryTool yet.
+#  - type: MultiTool
+#    tools:
+#    - behavior: VesselCompression
+#      state: hemostat
+#      useSound: /Audio/Items/jaws_pry.ogg
+#      changeSound: /Audio/Items/change_jaws.ogg
+#    - behavior: Setting
+#      state: setter
+#      useSound:
+#      changeSound: /Audio/Items/change_jaws.ogg

 - type: entity
  name: hemostat
-  parent: BaseSurgeryTool
  id: Hemostat
+  parent: Retractor
  description: A surgical tool used to compress blood vessels to prevent bleeding.
  components:
  - type: SurgeryTool
    surgeryType: VesselCompression
-    baseOperateTime: 3
  - type: Sprite
-    sprite: Objects/Specific/Medical/surgery_tools.rsi
    state: hemostat
+  - type: Item
+    HeldPrefix: hemostat
+
+  # - type: entity
+  #   name: bone setter
+  #   id: BoneSetter
+  #   parent: Retractor
+  #   description: A surgical tool used for setting bones.
+  #   components:
+  #   - type: SurgeryTool
+  #     surgeryType: Setting
+  #   - type: Sprite
+  #     state: setter
+  #   - type: Item
+  #     HeldPrefix: setter
+
+# Saws
+
+- type: entity
+  name: metal saw
+  id: Saw
+  parent: BaseToolSurgery
+  description: For cutting wood and other objects to pieces. Or sawing bones, in case of emergency.
+  components:
+  - type: Utensil
+    types:
+      - Knife
+  - type: SurgeryTool
+    surgeryType: Amputation
+    baseOperateTime: 6
+  - type: Sprite
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
+  - type: Item
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
  - type: ItemCooldown
+# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
+
+- type: entity
+  name: choppa
+  id: SawImprov
+  parent: Saw
+  description: A wicked serrated blade made of whatever nasty sharp things you could find. # It would make a pretty decent weapon, given there are more space for some tool mods too.
+  components:
+  - type: SurgeryTool
+    surgeryType: Amputation
+    baseOperateTime: 8
+  - type: Sprite
+    state: improv
+  - type: Item
+    HeldPrefix: improv
  - type: MeleeWeapon
+    hitSound: /Audio/Weapons/bladeslice.ogg
+    damage: 10
+
+- type: entity
+  name: circular saw
+  id: SawElectric
+  parent: Saw
+  description: For heavy duty cutting.
+  components:
+#  - type: PowerCellSlot
+  - type: SurgeryTool
+    surgeryType: Amputation
+    baseOperateTime: 4
+  - type: Sprite
+    state: electric
+  - type: Item
+    HeldPrefix: electric
+  - type: MeleeWeapon
+    hitSound: /Audio/Items/drill_hit.ogg
+    damage: 15
+
+- type: entity
+  name: advanced circular saw
+  id: SawAdvanced
+  parent: Saw
+  description: You think you can cut anything with it.
+  components:
+#  - type: PowerCellSlot
+  - type: SurgeryTool
+    surgeryType: Amputation
+    baseOperateTime: 2
+  - type: Sprite
+    state: advanced
+  - type: Item
+    HeldPrefix: advanced
+  - type: MeleeWeapon
+    hitSound: /Audio/Items/drill_hit.ogg
+    damage: 20
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -18,7 +18,7 @@

 - type: latheRecipe
  id: Gauze
-  icon: Objects/Specific/Medical/medical.rsi
+  icon: Objects/Specific/Medical/medical.rsi/gauze.png
  result: Gauze
  completetime: 500
  materials:
@@ -26,7 +26,7 @@

 - type: latheRecipe
  id: Scalpel
-  icon: Objects/Specific/Medical/surgery_tools.rsi
+  icon: Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
  result: Scalpel
  completetime: 500
  materials:
@@ -34,7 +34,7 @@

 - type: latheRecipe
  id: Retractor
-  icon: Objects/Specific/Medical/surgery_tools.rsi
+  icon: Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png
  result: Scalpel
  completetime: 500
  materials:
@@ -42,7 +42,7 @@

 - type: latheRecipe
  id: Cautery
-  icon: Objects/Specific/Medical/surgery_tools.rsi
+  icon: Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
  result: Cautery
  completetime: 500
  materials:
@@ -50,7 +50,7 @@

 - type: latheRecipe
  id: Drill
-  icon: Objects/Specific/Medical/surgery_tools.rsi
+  icon: Objects/Specific/Medical/Surgery/drill.rsi/drill.png
  result: Drill
  completetime: 500
  materials:
@@ -58,15 +58,15 @@

 - type: latheRecipe
  id: BoneSaw
-  icon: Objects/Specific/Medical/surgery_tools.rsi
-  result: BoneSaw
+  icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png
+  result: Saw
  completetime: 500
  materials:
    steel: 90

 - type: latheRecipe
  id: Hemostat
-  icon: Objects/Specific/Medical/surgery_tools.rsi
+  icon: Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png
  result: Hemostat
  completetime: 500
  materials:
@@ -74,7 +74,7 @@

 - type: latheRecipe
  id: BodyBag_Item
-  icon: Objects/Specific/Morgue/bodybags.rsi
+  icon: Objects/Specific/Medical/Morgue/bodybags.rsi/item.png
  result: BodyBag_Item
  completetime: 300
  materials: