From 20fd7bb5a9718b581d4879dc0711310be0865f71 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 16 Mar 2021 07:48:54 +0000 Subject: [PATCH] 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 --- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 +- .../Catalog/Fills/Crates/medical.yml | 2 +- .../Catalog/Research/technologies.yml | 6 +- .../Catalog/VendingMachines/robotics.yml | 3 +- .../Objects/Specific/Medical/morgue.yml | 15 +- .../Objects/Specific/Medical/surgery.yml | 245 ++++++++++++++---- .../Prototypes/Recipes/Lathes/medical.yml | 18 +- .../{ => Medical}/Morgue/bodybags.rsi/bag.png | Bin .../Morgue/bodybags.rsi/item.png | Bin .../Morgue/bodybags.rsi/label_overlay.png | Bin .../Medical/Morgue/bodybags.rsi/meta.json | 23 ++ .../Morgue/bodybags.rsi/open_overlay.png | Bin .../Morgue/morgue.rsi/crema_active_light.png | Bin .../Morgue/morgue.rsi/crema_closed.png | Bin .../morgue.rsi/crema_contents_light.png | Bin .../Morgue/morgue.rsi/crema_open.png | Bin .../Morgue/morgue.rsi/crema_tray.png | Bin .../Medical/Morgue/morgue.rsi/meta.json | 55 ++++ .../Morgue/morgue.rsi/morgue_closed.png | Bin .../Morgue/morgue.rsi/morgue_nomob_light.png | Bin .../Morgue/morgue.rsi/morgue_nosoul_light.png | Bin .../Morgue/morgue.rsi/morgue_open.png | Bin .../Morgue/morgue.rsi/morgue_soul_light.png | Bin .../Morgue/morgue.rsi/morgue_tray.png | Bin .../Medical/Surgery/cautery.rsi/cautery.png | Bin 0 -> 181 bytes .../Surgery/cautery.rsi/inhand-left.png | Bin 0 -> 372 bytes .../Surgery/cautery.rsi/inhand-right.png | Bin 0 -> 374 bytes .../Medical/Surgery/cautery.rsi/meta.json | 22 ++ .../Specific/Medical/Surgery/drill.rsi/0.png | Bin 0 -> 240 bytes .../Medical/Surgery/drill.rsi/100.png | Bin 0 -> 108 bytes .../Specific/Medical/Surgery/drill.rsi/25.png | Bin 0 -> 108 bytes .../Specific/Medical/Surgery/drill.rsi/50.png | Bin 0 -> 108 bytes .../Specific/Medical/Surgery/drill.rsi/75.png | Bin 0 -> 108 bytes .../Medical/Surgery/drill.rsi/drill.png | Bin 0 -> 238 bytes .../Medical/Surgery/drill.rsi/inhand-left.png | Bin 0 -> 514 bytes .../Surgery/drill.rsi/inhand-right.png | Bin 0 -> 517 bytes .../Medical/Surgery/drill.rsi/meta.json | 43 +++ .../Specific/Medical/Surgery/saw.rsi/0.png | Bin 0 -> 241 bytes .../Specific/Medical/Surgery/saw.rsi/100.png | Bin 0 -> 111 bytes .../Specific/Medical/Surgery/saw.rsi/25.png | Bin 0 -> 111 bytes .../Specific/Medical/Surgery/saw.rsi/50.png | Bin 0 -> 111 bytes .../Specific/Medical/Surgery/saw.rsi/75.png | Bin 0 -> 111 bytes .../Surgery/saw.rsi/advanced-inhand-left.png | Bin 0 -> 904 bytes .../Surgery/saw.rsi/advanced-inhand-right.png | Bin 0 -> 944 bytes .../Medical/Surgery/saw.rsi/advanced.png | Bin 0 -> 322 bytes .../Surgery/saw.rsi/electric-inhand-left.png | Bin 0 -> 846 bytes .../Surgery/saw.rsi/electric-inhand-right.png | Bin 0 -> 873 bytes .../Medical/Surgery/saw.rsi/electric.png | Bin 0 -> 290 bytes .../Surgery/saw.rsi/improv-inhand-left.png | Bin 0 -> 272 bytes .../Surgery/saw.rsi/improv-inhand-right.png | Bin 0 -> 278 bytes .../Medical/Surgery/saw.rsi/improv.png | Bin 0 -> 164 bytes .../Medical/Surgery/saw.rsi/inhand-left.png | Bin 0 -> 486 bytes .../Medical/Surgery/saw.rsi/inhand-right.png | Bin 0 -> 484 bytes .../Medical/Surgery/saw.rsi/meta.json | 76 ++++++ .../Specific/Medical/Surgery/saw.rsi/saw.png | Bin 0 -> 216 bytes .../Medical/Surgery/scalpel.rsi/0.png | Bin 0 -> 248 bytes .../Medical/Surgery/scalpel.rsi/100.png | Bin 0 -> 111 bytes .../Medical/Surgery/scalpel.rsi/25.png | Bin 0 -> 111 bytes .../Medical/Surgery/scalpel.rsi/50.png | Bin 0 -> 111 bytes .../Medical/Surgery/scalpel.rsi/75.png | Bin 0 -> 111 bytes .../scalpel.rsi/advanced-inhand-left.png | Bin 0 -> 254 bytes .../scalpel.rsi/advanced-inhand-right.png | Bin 0 -> 257 bytes .../Medical/Surgery/scalpel.rsi/advanced.png | Bin 0 -> 171 bytes .../Surgery/scalpel.rsi/inhand-left.png | Bin 0 -> 250 bytes .../Surgery/scalpel.rsi/inhand-right.png | Bin 0 -> 242 bytes .../Surgery/scalpel.rsi/laser-inhand-left.png | Bin 0 -> 241 bytes .../scalpel.rsi/laser-inhand-right.png | Bin 0 -> 234 bytes .../Medical/Surgery/scalpel.rsi/laser.png | Bin 0 -> 177 bytes .../Medical/Surgery/scalpel.rsi/meta.json | 76 ++++++ .../Medical/Surgery/scalpel.rsi/scalpel.png | Bin 0 -> 166 bytes .../Surgery/scalpel.rsi/shiv-inhand-left.png | Bin 0 -> 269 bytes .../Surgery/scalpel.rsi/shiv-inhand-right.png | Bin 0 -> 280 bytes .../Medical/Surgery/scalpel.rsi/shiv.png | Bin 0 -> 180 bytes .../scissors.rsi/hemostat-inhand-left.png | Bin 0 -> 332 bytes .../scissors.rsi/hemostat-inhand-right.png | Bin 0 -> 337 bytes .../Medical/Surgery/scissors.rsi/hemostat.png | Bin 0 -> 201 bytes .../Surgery/scissors.rsi/inhand-left.png | Bin 0 -> 356 bytes .../Surgery/scissors.rsi/inhand-right.png | Bin 0 -> 361 bytes .../Medical/Surgery/scissors.rsi/meta.json | 44 ++++ .../Surgery/scissors.rsi/retractor.png | Bin 0 -> 219 bytes .../scissors.rsi/setter-inhand-left.png | Bin 0 -> 340 bytes .../scissors.rsi/setter-inhand-right.png | Bin 0 -> 347 bytes .../Medical/Surgery/scissors.rsi/setter.png | Bin 0 -> 200 bytes .../Medical/surgery_tools.rsi/bone_saw.png | Bin 417 -> 0 bytes .../Medical/surgery_tools.rsi/cautery.png | Bin 171 -> 0 bytes .../Medical/surgery_tools.rsi/drill.png | Bin 272 -> 0 bytes .../Medical/surgery_tools.rsi/hemostat.png | Bin 142 -> 0 bytes .../Medical/surgery_tools.rsi/meta.json | 27 -- .../Medical/surgery_tools.rsi/retractor.png | Bin 212 -> 0 bytes .../Medical/surgery_tools.rsi/scalpel.png | Bin 342 -> 0 bytes .../Specific/Morgue/bodybags.rsi/meta.json | 27 -- .../Specific/Morgue/morgue.rsi/meta.json | 55 ---- 92 files changed, 558 insertions(+), 183 deletions(-) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/bodybags.rsi/bag.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/bodybags.rsi/item.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/bodybags.rsi/label_overlay.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/bodybags.rsi/open_overlay.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/crema_active_light.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/crema_closed.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/crema_contents_light.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/crema_open.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/crema_tray.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_closed.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_nomob_light.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_nosoul_light.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_open.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_soul_light.png (100%) rename Resources/Textures/Objects/Specific/{ => Medical}/Morgue/morgue.rsi/morgue_tray.png (100%) create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/0.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/100.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/25.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/50.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/75.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/drill.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/0.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/100.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/25.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/50.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/75.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/advanced-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/advanced-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/advanced.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/saw.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/0.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/100.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/25.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/50.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/75.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/shiv-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/shiv-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/shiv.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/bone_saw.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/cautery.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/drill.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/hemostat.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/retractor.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/scalpel.png delete mode 100644 Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Specific/Morgue/morgue.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 279c68870f..75dfeb86a6 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index e68a49e442..d7dac5df1b 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index c92189f9f3..573c90a3c6 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/robotics.yml index 5390679440..67b07c779a 100644 --- 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 - diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index c5b141c9b4..d012a274de 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index e382d0696f..0bf360a9d2 100644 --- 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 diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index c983e5ba94..a22abcff29 100644 --- 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: diff --git a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/bag.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/bag.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bag.png diff --git a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/item.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/item.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/item.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/item.png diff --git a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/label_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/label_overlay.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json new file mode 100644 index 0000000000..0e1952d1c2 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 39659000f380583c35fb814ee2fadab24c2f8076", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bag" + }, + { + "name": "item" + }, + { + "name": "label_overlay" + }, + { + "name": "open_overlay" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/open_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/open_overlay.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/open_overlay.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/open_overlay.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_active_light.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_active_light.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_active_light.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_closed.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_closed.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_closed.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_contents_light.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_contents_light.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_contents_light.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_open.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_open.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_open.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_tray.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/crema_tray.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/crema_tray.png diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json new file mode 100644 index 0000000000..189f8094ac --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 31d88c7454e429a64fbae4a9f7b4aecaf838e9a1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "crema_active_light", + "directions": 4 + }, + { + "name": "crema_closed", + "directions": 4 + }, + { + "name": "crema_contents_light", + "directions": 4 + }, + { + "name": "crema_open", + "directions": 4 + }, + { + "name": "crema_tray", + "directions": 4 + }, + { + "name": "morgue_closed", + "directions": 4 + }, + { + "name": "morgue_nomob_light", + "directions": 4 + }, + { + "name": "morgue_nosoul_light", + "directions": 4 + }, + { + "name": "morgue_open", + "directions": 4 + }, + { + "name": "morgue_soul_light", + "directions": 4 + }, + { + "name": "morgue_tray", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_closed.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_closed.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_closed.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_nomob_light.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_nomob_light.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nomob_light.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_nosoul_light.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_nosoul_light.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_nosoul_light.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_open.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_open.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_open.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_soul_light.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_soul_light.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_soul_light.png diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_tray.png b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png similarity index 100% rename from Resources/Textures/Objects/Specific/Morgue/morgue.rsi/morgue_tray.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/morgue_tray.png diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png new file mode 100644 index 0000000000000000000000000000000000000000..6a74b13d7edeeb00dc7d9069a19f6b35a251d07c GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0Mf5`Kz$7v?5on{QCa& zyN|gA6f2lGND1ian|qv0bNsm2#Ys)sQ9Jt(P$^?ckY6x^!?PP{K#q;4i(`n!#N-4C zK?i}Ur&Hc65n+0~W9sy9pIBSt0FFr3rS1NT?8c-!e z^L{>Zc4OJvv-HZTt8!mBZ@|&+rV$YtpS?<&7pYbU)VHZ=?-7>{J{M5CZu_> zoQDSh000000002c5XXttV5KwpfX=9r;h&DS+U5|Pj-Bglz{k#koQ@CGN7`v#m|i)R z{f)j{yv*ff_GG=L^G&wR1vItr`GMc$0-EZ~2wkHIojH81NiLu%@&f<>w>|-0lyZKc S7OsE*0000;`ZPuGk?kO_rcavNg!6aRtmatQXMi0-(V%#}o=AVFCnMQi%YAz(FQ= z0pv%J%55!Mx3+m7+mrS`r%lawBme*a0001>)b7R;)9v<5+WMV553>!=FL9>&r309a z+9vKDr=IAx)h9y*yC13R7Y@J=BQv=9k|gyz&C(2^b^TP6{?5Owwl?pA>jh@|{U%9z zjUVRL71d$u#7I(O??8|D7unA5dV#TQr!;ST5zBUr>jmk1sZ#Ta)I;#YsB+CGEZZ?@ z{s{m8000000001zq%666SyXO6V54TE_C~*mJoXg+6?^wPO>?^6(Cz0`KSyV}8l2}I zpZj5C>XV@)>2mzOw&$&Mqm?rF3<|%ikU4|TpfquP9z!Ti^NDq4@KxSb000!lFU5dz UesINI^#A|>07*qoM6N<$f<{}YQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json new file mode 100644 index 0000000000..cb2fe31f9b --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cautery" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/0.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/0.png new file mode 100644 index 0000000000000000000000000000000000000000..765094c4cf6e93c724abc5239b5834bba47b871e GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q&Ne7LR^9LJwux*?7Fr2GxUHQ z#*!evU)e_1 z!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTSybE$^0y8Cs9&TeDX%_}4{ zl1?0*88&6cY_23`)1^zEsf01jTxPW_<`mbuI=zHwh6e$%TZLS`mH?d~-W?(tNz#bIPm=Ba>@O1TaS?83{1OT>O B8UFwP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/25.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/25.png new file mode 100644 index 0000000000000000000000000000000000000000..6731fbc6064021d0f205a3f6f26c5840bf17f397 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0H^qjA4TYgMYN{YaoZQ zB*-tA!Qt7BG$2RN)5S4FVrp`NM8yHK3w#Hd8CXs*um=S+<^v@eJYD@<);T3K0RT?z B7&rg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/50.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/50.png new file mode 100644 index 0000000000000000000000000000000000000000..30578d4ca777af010d3947a7f706b77195305bc1 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0Md)r_!~2p47O%X+RER zNswPKgTu2MAdaA?i(`ny)Z_$-iUVdB_zo~Lu$*9E4+?0^2TC${y85}Sb4q9e0H=@{ At^fc4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/75.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/75.png new file mode 100644 index 0000000000000000000000000000000000000000..af4d131c02ba93084177f20c699b755154c0edd8 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0LT@E-W?(tNz#bIPm=Ba>@O1TaS?83{1OT>O B8UFwP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/drill.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/drill.png new file mode 100644 index 0000000000000000000000000000000000000000..267c3e0119a80a40f0487a8c12f56dcc13ff67a5 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0J5V-yas1rf=>sgP!i zW+1J}b>76PC#N@YR)SI2-Z^ewr&j3AoYS_dsZrBcBDBHsEQ4>W#H@xaiB$}zKTTp@ g!IXZ^fJcdeA*xFv#xeT2G|&MIp00i_>zopr0G#7bB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..85164e2dc70098f0493a681710a400ee9657c3a3 GIT binary patch literal 514 zcmV+d0{#7oP)*p9H zC=t{!(o95@Oz1Rj5f-6%LuJBIE@&FRAD(hS)5iKDnQ)Z*ulql%B(efZsbl(Z^7MIo zL;16-v0}VjUi7YOoe0%B5mk>jK%@YwxL%owh_dZQAlq&PBy!Ak0pi;mSRJ@DPb*1>{`*ZmmJwN$W_p9_;DT*wA zaR(>oV=rCPvf1^@3-MoKs7VT-;{M;5>qBrFL<_LB6O#=8|1I?X2LJ#7000000D$E& zjo}DYIh4N^S1}whifP%LOy~poy3(Qb*}h3uF&r^UfBc_=6EiJ)E$nH=>e!o)AID2nX;@RSurk>z5E&=epSOZ4SCDtFHvP&m7y&)XaN zFbh=49Q&CgSM_e3>fLzn`sMOs=<}Wh2rHx06pT(&AR@9#_Q;*Pa0MXxIkT*i%~IPN zBcF|W-N+a6^!(&d!>Q40wJi9W;T-WSK;|eza$2JDU6QV=df z)FuyfaB?1+(|?ev>C7tG(|yN;xd24}%YPvc!Ep>Nz}8N3R(Svqi~c(X0000000000 z00J4o`uwXa zU-WoinXh3DU;6L?#`gv9IRc*Xm;MYu0sIKUdyoQy8o?PT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json new file mode 100644 index 0000000000..b97c800777 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "drill" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "25" + }, + { + "name": "50" + }, + { + "name": "75" + }, + { + "name": "100" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/0.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/0.png new file mode 100644 index 0000000000000000000000000000000000000000..6b18bd1379b2d8eabd7b9f55cc411e2e0a5c23ae GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q&Ne7LR^9L6n5QvhBn)e_1 z!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rNzdW>kggW#;TiFNSrW# z^2kTq>x?h!#>S|ipkg8IMxS8WV7*k6fhW`Jup`ZD9_;O>gTe~DWM4f Db8{H< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/50.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/50.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f78a0a7440f53347468691b97c593833e07b0d GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0H^YpXc*VCCAVUUO*0G zNswPKgTu2MX+VyMr;B5V#MI=31=a!$h9WQW%})Z&C}1!=dtj~-P@cil)z4*}Q$iB} DC@AjW8c8-cJahOGn%5kwu)I6Z84&dYS0o~x6--_t#ud%yF2-}%nj;QIpv zK@bE%5ClOG1VIpGj?QReI-`jlw;y}L+reCWI-`k+Dm@Db0=G3z@i3AP9uCTFSQeHs zrPV^b*ocvD5mZ+h%Ci!5MiUDN0uxpG13M_+X;GzTYgc+$KoD4Um4S&WJ>!u8?iFBh zxLG_Ltl(uY9u8Jm9B$?@HzORH0RRka|HhP7i(l)}L$9Mcw1+Y-H`d_ZtiZe*0)X_+ zNpmBAzwhg?ykfi?0xXVO?Dm}=Jemu^7Mek9OM_@i%_Vq1fdrV^TVV`!0vTufI@)$7 z--GRy1W~1D9&>Yc{N}?)^mVi$Jo^g1#u@2iMkEHt2Fw+|S42^)j)2=Gm>XE2sTOvd z9ajGs)~}lZq$}dEC?TTYE|37y9o|yJ5yhf}h=RL7LQb*bh+;W0B8pPQ5yf(%L=;Mi e9Y{n$@Z%peBhtOW!F0m_00005JCtcgb+fAT_|iMRoFAEtth&{)h%=bMvFQ|2rera!u zsVl$zg!xf7Q?0G^KYHT$z2>=_T14e^y4RBJ02Dt`e`EXO33w1{FAqAe9J#uJ=M!~s-hY7%hPbmgDl9gT4`z|_FgO1Lr@lN6**MvOFF5i3-vBRb2|8*@r}`XC zaC`%-2d^GH$;!=Xf}_J^mURI3roVk7#duLJ<^!j{x&T0MbeOr-An;=Q{(Al#D>tXP zdhjHGqZt5>{V>0Lm2x2V1v*Wq(&E+4W|}y+$wGQZD8L}Zz!$wkBXYp@qE`Bw?YCa&dtn>WwGp+^xAf4)U95uTM zAk;(HNUF{0k9yg*0ow%-e3?xZete6zoDFVPYXHG3$4UcoJsm_t`}nv!#Kea4zgkso z0Mr&h@WRw0D%Q02>c*od#G2ON=Q(ck8KxGg`5hKlgM^Kw8vo{N07n1;U~V-?w54KS z8}UBQ-~G|^O0bGAZ8)LM^>l1WfYqx3u0v8@0|;JN#V>uDVjz2+qlb@@>*=t6ujg_7 zjt24)K=9(ff*KPSPuD%C;OZM-sY?LCrPl>D8j_~~f(yGUsNq)tL4pm!fBynerODhk SCb#JT0000!#Vs950%0$*Xep>{-!(J*T6hyxs~d(PLofnr_0ecKHz= Qpr;r-UHx3vIVCg!0LPSX;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..48968ba0a61eeed8d87786e59273ca65ed84c7f8 GIT binary patch literal 846 zcmV-U1F`&xP)m`X$X`GQ_)%~SX~&gAhxW2E9WNd*d!PVmQgcDG}OtP0~@7E*nP3lJcY;Eyrfgl)#VEGCvV zaeU4&-eu9cWp~4Uhzn4e^(=t#E(od zH_1rpQ2m|M-~q&DDj+{OZT7tz0bujV7Y)V#cz3@6>VxOW7-KUP(VRC*1_QWx;{mPB zUjRs@(k2p*12A^w%r7PGX0isrFBVyRwFE%1Rt4a>@ZceY6%ZVJezc$KW7n8jC~@!h z9U}4gsv@|VtnrIQPMkhPqN9zo?j<7S=K$g}A39aPW~zS8xCz@7(tRdBIc=(b?Wcc* zs$Vnt$!Swa_Zc@~o8bGf^9=1C05G#q0+tW1L`U1I?Gqhs_1|0YZPr!NV0P`;4#55Uw?xH|G*QSV_T3!eHO07mZ3J(sfcNwnyLN0B z6G7TU5y~>nPfjljabcL@JyCLz!#KT3jvnY~sK2UTGcyY%S|=`&n=f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a7098afe4f7b5a35a6d8b224d36ca75a25ef76b5 GIT binary patch literal 873 zcmV-v1D5=WP)8zq#Y}?8)d;BM0XVC=b7-Nhv z#u#Ia9YUg4CebTXBlou1{Q$d(UYVjE0aHQ_MveQaw`K!cb>RST`othbJp!(LBrI%p zAnFmIN}^eBJ+)VDfGUX;^#}lf+*({{x?&qdl3D!Bd;@;gFZAc|`{Q|kQ zxZuBZyXC%wo$sH8h0P93_wFL5oJ4wg4}GKUP(xv=_l4DLKqQ%k8VZwpsHgdgZD2GZ zlFR}C?q)7P9`Qj9g~=GJre>FZJU>SO@Zr=fE}uW!lD~mLl|;g%3ILdOy#W9mzxKXr z&BrQE6bcgn=&2Oa%bNgzCxw?5mTHgr)tun(&JzHn^*sQ9q6Ep|b{DVTzggCdvH>*| zCOwtH)f?9#4Y+Vioq;3!&U}E4^;^c+_;jZqkLMp?bv=U@PoKfzc2{hIDX$kOwzNW8 zaEw$*q`Y3Byk2Oz&97cY{i-CA796A4(n{HS$~Hl1z-4YItLvEqD%C#58Y0Ooqybmi z^?w@B?rJSqF1IVA!p0n z6;Fo^#k2Q8n(p02VA%O5fZzxd-p<=nP&Gro2?Bsm+M;ErRW-kW{{;{*siK|$f>mCT zh%QGzGlPcnEeb7^>)=sF|6+lpwAQ>AWWA^wBf30`gOLo_400000NkvXXu0mjf=go@k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/electric.png new file mode 100644 index 0000000000000000000000000000000000000000..3eafc6f5ffd5b476f5d0079a1aa7e54aee6c0370 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`S0J5ls^Fxi>=sabGR;xJ z#Np#&7byX~u&^|JbC3M`{`I?$J$e4hk+;AIsFblJ$S;_|;n|HeAZMkgi(`n!#N-5t zn1;X;M~;d{I_Rtn2#|?%IKp}G*$hi&odrvlun0!%%`RnjUO0K>jP4y-3=__mrd@wG zl_#lh_mN9Sj-GC0x|{CzcGgXmX`7;t9-VklP{W}5{GoG^!AItlt=wVJ$eOlR=wg(q z?~zQyn1r;;v+f3m9O(^ZX+6L+cXQcX%ex^<;?^mxkm53$Qv7wD?Q(}}+FDbmi#JHz lU0tT{@KOB6QfC1MhW|{49(JaT>Oe;`c)I$ztaD0e0ssUBZIb{1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..97298d290351750afe898374904e330597428f47 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHy|s|%j#998J$TyABC5W$)(uVSj)2-N}A)y?_P)fyA;! zYjUk-M&2(zzK>mM@@}j)p5I;P?s=(l`!_3b z#nhWu#8TgW(cUqye_iJGxy~A=ZkfIPwwrmvuGSC6r|oy#VSyM9B=>wcY2BpowZg|U z>ZZVZj(d+53znt&$Zcy9_D67StHBE~%My;}IJ+(TY*;Df#PPW)}=B$!uy5UTobMMqGnw2fh`9%9}|DXQ;LGAs!>ul5+fo3o; zBz2N8RZc)m-G zxTGmJJ?`di-*@kpZj|@5m>yOyYXAMm^x~PR?|l3IVm$z2tmz VH|z0X^MfEBgQu&X%Q~loCIHhlb4UOH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/improv.png new file mode 100644 index 0000000000000000000000000000000000000000..ec48a9a9af26db665e5d13cb0eaa1e8a36070cc5 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvSCF8IgSA_iedR&7fa3i6 z{`I?$>FC5wdb_b6D92b5qPfJfv4~rtxx|Nxk zD;4`*y;_yXlpttmt{@<+tEDC4>vH{VN8UV!v#~Z$7#P^t*&p_>*xUu0!r@P)xQYQcc0Z%xl2+GL+%nIKR_4FUAL zcjexuW6w`sTJG+><0|eU0ssI2000000I*^dba)hW_?q`^j^~^^i66}eue>IyC^nwR z@jF!&!;0gTpRc!UQUn#nJebT*3LsSkksYvaI8Ny4`B7^ps3_)kw?*k9l^&KH$MsKE z&~bgfv=dYm^L)K!$Mp}M8BAs;ZMBzAxTvkD2sbtPoNf`$O}?m2g4h|5?KX|!IHBVr z=$Nm!JRB#K?KTaGvF#J@z;S&J`yr)^l)`>UAMc;EdVM+QcmMFqpRHo@m2q63m($*_ zpR!TV;pMbf`G5YticYfKrm=ds{2gDtecjf|0{{R300000008_8Rb6M>xHYzZGxU=U zD3J>=p`w_T*CgdNCA%qaFqs+U0!$QT2#CtLR3oudp zYxJ_=2pzSbe9kl+p+ho5VEqiZCKq7BR)#?ACRQgGVB$|^2y}7*CL}ThqWJ*bT!0B= c2mq}526&J?EPvM#5dZ)H07*qoM6N<$f-Ah#4*&oF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fa264114bdd6435f3bfdfc341f419910dd836508 GIT binary patch literal 484 zcmVC4%zjON}#82L` zolFJOYfWa^4o#LDO0R9BqwpjMlh0c-fl?9fE%{iSaNb&61mRm?8y#snU$FD((9#{K zF6YysHJvY5x(G>^uhebQIGbk zfziia#IhaQuLhY{Cg(F%=j+@00000000000MJZzc8zu2N7xyX z!H4bNk81y2^*(?5H=;$K7sR#xds*D`GfmDa6*>XwB1re&6(!qsjZ&!puISpVLKXX$ zrn3mf3~I>q-&NH;t5E7KAk%-Zg3eimN;Z`4ze_T5RzcK%FRHFth0J_FQ9AnX_d2Tp a&>%mSPCYDdDpMc;0000VS)S0L>cP+a7ywSM=p{QCYK zEe7|t*(#VgIH@ToD7*>>N;8%O`2{mLJiCzwg5#>-PJTD z$WiN-6ZhP?y}hw4-j^={xfZkT@HQT}b7$q^#m%Q09fCm)mflrSHt!qIS_V&7KbLh* G2~7YSWJTBj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/0.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/0.png new file mode 100644 index 0000000000000000000000000000000000000000..cf0d73c7c0075c744488c81247713798b469cdbf GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH#0(_wf1V}|q&Ne7LR^9L6n5QvhBn)e_1 z!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rG=&8as^ZMeMdsBJ9Ks% zt8QK)p^=M>SHzcB~G7#U`{$Tx}Fh${l!A?oSk q7@{#TIYFYaK`^!qh(aGw0fVQjpUXO@geCwjmQ*qT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/100.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/100.png new file mode 100644 index 0000000000000000000000000000000000000000..765d008eec47c1df50b7e7fdc4fb1630426aeeb5 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0F8a%AoIEf=lO(r$7#4 zNswPKgTu2MX+VyMr;B5V#MI;j36=)IV+m3o;R&n^O!paBzQ>+g1(av-boFyt=akR{ E0QKb>{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/25.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/25.png new file mode 100644 index 0000000000000000000000000000000000000000..576c092ab6243f97c13be7cb9ed596b0d2b10f4b GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0KGXgW-M{1Cx%}dLW0f zB*-tA!Qt7BG$2RB)5S4FVrp`N1WSY9u>>iP@B~%{ruz&m-(yd$0?IRZy85}Sb4q9e E0AB+g1(av-boFyt=akR{ E0MLXQO#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/75.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/75.png new file mode 100644 index 0000000000000000000000000000000000000000..765d008eec47c1df50b7e7fdc4fb1630426aeeb5 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$efS0F8a%AoIEf=lO(r$7#4 zNswPKgTu2MX+VyMr;B5V#MI;j36=)IV+m3o;R&n^O!paBzQ>+g1(av-boFyt=akR{ E0QKb>{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..dd20ff99a96bd0612c8aa3f07d8c7bae4ee60516 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=M?GB}Ln`LHy=BOENI~RS;TMaz z13NwUdhtIfjIp*XWME?#63V-9cByCbcDaTJtTH(d15N(l=d+PBsMTNv>IZ_5ljXis zW_;H$%*@-D{pjz{Tf2My#^|e0yez)`OK#A^m5=u;{$gR1Hp_RC7H5|(njSLm{j3$e z(N|e=V`P^9G++N${jtgVJSK=?Kr&#bP-mXs&C3s`xKwms*}BR6K~1#`n{-I0LCMS8 uRmvqVT_U8#m;U1oegFO+KLbNU>>ftV=79+N{%d^GmO$Cj(6Yf`-uS zRZb?azbA_tO~3tlY2Kk{bNt(FcqLv1ZOS!kUZ}VK+P^}Uwp~+ROy0TUxL$tbNz*K%)~YMHe=F2r|(p2zL4vv=4)%mb1eg1Ws|*LTh@o@eTo@cTOd#21%UK&rl+ wlv)4%sq0tY&=-%=mxeC6`ie)6fgyqMo}W%!?U|P=BtRy3y85}Sb4q9e01hB!0RR91 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..a69fb1cae3a798b0d0ae16bd5733b25e4f090832 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0Ei0mZop+v3~cl{QCYU z&tDa}YJFVnax%@)Nlp3tdb`g+6^tc8e!&b5&u*jvIo6&ojv*QolM^JqH3TwtCM&JT zk$5zPjgixV@mhlV(S*&LHf{R$=~EY{g6gt^Y+hc*X=i3|vV19jtH8`4+R1n9qvx^Z QKw}s@UHx3vIVCg!0O*Q2JOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5c498d5f08cce46be2498bde81151ddf7dadd31c GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=2R&UJLn`LHy|t0I*+9S{P&?>b zA|u-grk)AY1T$XDR21If?C~yknX8v$Yf7gXbBvfr^T$N>U-=D}@BWOrE6EHr0tiG_ zzGb`EQGJnPR@7}?p=XxmQa?@3#yYA(E;eVO7zgFJG@p{jmdGD`i&dq6|9x&Bmk rgW)gf#Md=Dk7obg{hN`2VZu@N#~MM$eyF%;gS30P`njxgN@xNA@D*ex literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ce54cd652eb042d0ae7dd95ff8ea35f2e5816707 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J3U<-Ln`LHy|tIO*+8J}VepbS zk6CRT#1dGd+!hp`=b3q6ZtIhIqAylVm=N(OXzB4k(tG`LZ~j~N*N+9L8wgHBg__SQ z`d50zeVx(Q+D`&<%Qa5bvISi2eOGpqwJqWL|5}c)==4pz`bw9q7TcA*l&pEPiT}U3 zU-2!0nl~kLp1HTMLkt3vMx`$A_h&jjI^)`+81Z+{{&d^zKCgT7UOf=sRT{l_S982Z h_cp7Y%|H!18s!@{8uVfz38 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed471774ab6e91a728002d1cc470ba195e15666 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J3L(+Ln`LHy|t0I*+8H*Q9Sa2 zTE`SlBQ{&1QmrVrgl2=T>fPlNEhkLS*mG!U$AqAyMJ$j1+-Lb7_xqd#P(KhTcz>_B zyf^@R*fCWp$K|FBkHv~ktst_^l8gf$m4B*&>n z$cM3RvU_21_GwFe&*eS4SRiJBj4O_w_Fz#?WRv~G)Q6hhAHq)mci1NUYy0#EkN&X- fiTt()s;PU$xpQi?NoES`K9D|7S3j3^P6yAMs3yJ>w1U3(6P$J`B_i0wr%}%2$2i zY2UT)os`SJ-yEl(ew)oK@w#N*^t|;mk9+o(KK(5H+N3}Dd%R}HivE=~?DE0iPuH)x z9aqL8KY88lx~`{;5Q7*P8vIPdSFgTQ{M6d_+AD=cS9$k2T;95C*TMRg-BGc39st!z ZePH|U66>lfw*C@Glc%en%Q~loCIEtUTm1k4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/laser.png new file mode 100644 index 0000000000000000000000000000000000000000..fd7208feb05aff38889911bca39482424c77ab1a GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iWS0Ei0miFZND}8g1^}CPd z*Y{6hmr7$%k`mC{B`EmLBUtiKI8Y4(V@Z%-FoVOh8)-m}ou`Xqh{nX^1c^Kcf!^~g zQW~@ro@9k-X=rFn3u6ow(6Cvp;o*6*STy8-=g~cPBsk8T7Cumu=9oBZSA_vH!}D5B UQKLf1`yg{YUHx3vIVCg!09Wia2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json new file mode 100644 index 0000000000..d72a449679 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json @@ -0,0 +1,76 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shiv" + }, + { + "name": "scalpel" + }, + { + "name": "advanced" + }, + { + "name": "laser" + }, + { + "name": "shiv-inhand-left", + "directions": 4 + }, + { + "name": "shiv-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "advanced-inhand-left", + "directions": 4 + }, + { + "name": "advanced-inhand-right", + "directions": 4 + }, + { + "name": "laser-inhand-left", + "directions": 4 + }, + { + "name": "laser-inhand-right", + "directions": 4 + }, + { + "name": "0", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "25" + }, + { + "name": "50" + }, + { + "name": "75" + }, + { + "name": "100" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png new file mode 100644 index 0000000000000000000000000000000000000000..8fbab261f4387147781bf3007b59cf57d3892887 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0KH9_p$u?{;;q#CpG0F zSFIf_22Y;9y0^_%-`sbK>pN>FpneeWTXLpk zjnrFXNRknyxeVY_I--H+4Y3c21j^=QMoQ#r|0d?Pa!zvW- U`;K$Bz*&${p00i_>zopr00k~|X8-^I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/shiv.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/shiv.png new file mode 100644 index 0000000000000000000000000000000000000000..f0936b2816495056d7c40440b12371689ea1e82a GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvS0JsU6KCz#m0#cQ7Er8U z;$UBSaQ*IMg8M|IfO3o_L4Lsu4$p3+0XbftE{-7@6O$7pIvqSb0s{jX52cxv74q^5 z3k!SsG@Y6yJ$r|R8ds;LniK1c)7`ziQ(IU>uO_fb%$}~z$;HLVb)YxJY+3u^mwXJ@ XBRSTnIa+Q2n#$nm>gTe~DWM4f*0(aI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c498493780c91bc924975fb762126fde1ffd2808 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;RraSW-L^Y+&Iyh8yZ$3Nab zA;;Y4ni#NRR-(X$H=5Hr+rBWKkV{Y$=Jt1V2sRGg$|d4?^+;`hw}Sb~$V=0zv%dX( z@$F9W{~h-y0u2R%hTUhvXKr7S8F=02Oxs#>yN=ib6W^MrUcKthOK0aUe|Guowf1`L z@GKMGGkgyZt}58E^ZIsi&r6>#ueli2zURZFEx&JhPx3p?zgbT8<;7JWDvYLFsd?=9 z!){N*Wy7*`TdOCn{N}fg*F!7=k^e+&E9b5^l5e_r{`=O bL&17&UXAQ)^FC_ZfK2yv^>bP0l+XkKJol9B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac71c383af2371dfbf2d21100e7cd3e8eee11730 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hE5aSW-L^Y*4;-XRBp)`!zO zl6Mq{o}9`Z6S%XnjY(j+gJ!@H#sEHng(87|f{whlvaF&)Ti*D7NRWdK+$$q_9P@BPj z>!hyuLN6X|Pi4<{$Mk2dzjiFoY3|?Yb`U#(WJA|FzuMeSRozc+v~Ag)`|z(_x>Zcr zBsZ^1&V}#S>pQZ2v|hD+=6?UFU45JH*tnkE{ByT{8Fvl;u1joRcG-F+N>8ubrtrl! gT(O>=fuZy(Z(m``a=Yx4(?J$^y85}Sb4q9e0F~g5QUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png new file mode 100644 index 0000000000000000000000000000000000000000..75be4d5e9c635b1453198bce5a55ee693f597348 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0J5V-|rSsyngpFDFHnN z69@TFy)2+8V@Z%-FoVOh8)-mJs;7%%h{nX^1PM8Z07f6l13!H9&Lvm{aB8j3%3w;{ zuuFqW+Q5LT%}T=3;cDA13#r*{44Ey3K22RsJUmW32F^2ionxI?S$RYkv~e|GG2X%E sn44J0$;)6I)9QOcM(ouAgDH#*KEXT;ms0~7ffh1&y85}Sb4q9e0KV}y;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..79b85824e9d55247b7d72b5dce5e7afc1dc08566 GIT binary patch literal 356 zcmV-q0h|7bP)BJ%dWm-W-*RljBXoUM^o@aIQ!xu)4dlBzasg}xVm zd482B4lfzr+Ele^`~2H?c~P3Sd%d!$YLge`)nx`%{;W%(!IcL9000000000Oth^}y zbeW;=E`sy@01=TiTXdcY+L+FkCW^ye8P3P!UB}`!e(n(Lwkzvw=PzKlT?J`&8gR}Z z?gEk1z;o>&+p8S{jlY0*I|Nz>^rF0`e_b8`;LsODM6RUDd!JeW0000fg<4VC8 zJrk`gng8on><%-t>Sjd%000000DwwCX!O!KbP&vI?N&@{`nX+1}2mTMFzdb(~s6vc^NL-D2aCUiPrF`tXL#+m>C00000 z0002SG4{KGAT<5PTOBRhx72ezM?{Q%eZE*5pP!GohxV_;ZN4L@8`axvc5mfx8H7gD zEZ5#s*aoM=%t=qH|1^K^VbaByhP?Tz*f!!0ZZ?Sm0PyPw#0Ii`HQvC100000NkvXX Hu0mjfq#U7+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json new file mode 100644 index 0000000000..42737acdc7 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "retractor" + }, + { + "name": "hemostat" + }, + { + "name": "setter" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "hemostat-inhand-left", + "directions": 4 + }, + { + "name": "hemostat-inhand-right", + "directions": 4 + }, + { + "name": "setter-inhand-left", + "directions": 4 + }, + { + "name": "setter-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png new file mode 100644 index 0000000000000000000000000000000000000000..b37b9bb1a202a865a1c6c9e16fb3ca25d4c89a86 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0KH9_p$u?ez$;PDFHnN z6Ng(n4LN|Kj3q&S!3+-1ZlnP@<(@8%AsQ2}`fucOaNyBRT7UT7>!W%?)E^-)pPcMHM_GZG=*XOop zAL3=6v3a>ir>NS~;0rI3?}vDMJPhO8%;hc{G^gA~@x;tWhI@bhcFt*cV78B O2@IaDelF{r5}E+j-%)J< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6fefc908b27dd03e74c4d7feefb2b9fd515951cb GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hWBaSW-L^Y+%ltiu5!$3Cu4 z?iUP{77do@>6{T-{zcQtMWeQ11G`3I(i=^;Rno?WOv0kU&9C+xUn{Y8g~o34@7q%T z)T^m|KW*E-qgVxKE)Xo3{xT=iDW&ZM@3H5t&f;~CtqW{C&#t?z<+mtqy8WEHrP00W znH$u4oLI$EQ!lk!dtN&Je0tnG@%mrWUR#E5U)WT?Z}(&4)6czTU$e2jH(z&IUX-$D z{`&V_lV8j*j3~W4YtfoD_4gO8IkQl*Ioy10sNuHv%n+M_WO&e&tFF@}f4x(xxX(Xf ziOzg$ez#nobZ=qx!1X-u9~VyFxMS^Q*`~8qPv^Yf%Q*XM)|99FFUQ_*^=7`M$YJ~J jU$`~Pwi}8J3YU6vy$O;$vj!nkh>`5Qi*gj`S(SAxIt|_y7_d#HWySHj9GD`mK(c_IV;M_Bw5~Vj-ss2VtDJ^<^ccz00000006+G zroJ19;(%(!cLZ%w{m{$qRm@(H*!*3Rob&e% t?4rl0-P@n?_m1^XKH8o|lK=pq=?8^Qkv-r)XgdG^002ovPDHLkV1ht`rMLh9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/setter.png new file mode 100644 index 0000000000000000000000000000000000000000..135d8a72c4b9856ff8ab182a925a9414139047fd GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0J5V-|rSsEG3|~e)lm2 z6Ni?se_Mc}j3q&S!3+-1ZlnP@DV{ElAsQ2t6C~su0vM;BPsw3Q+~M#vRCew`9x+8n zL3TE`g8|Iy%o`YzGcr~z?9Mh|cGj3w=IH9k#-_+NLsGAA;jx8HOnqDi#!ii|Bz>9} sY-2dvu);*N(5*OP1>@2<=>P_Xy}P-~-Na2@fc7zXy85}Sb4q9e0LD~0L;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/bone_saw.png b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/bone_saw.png deleted file mode 100644 index 4bb2a6bba912f97345cc9ef0a5497b58f6f459ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmV;S0bc%zP)Knd^?^9{ggd=! zHF0fi^YimvU0t%WvU78Dg@uJXIy&lSCbwcQib*G(ot-W#EM#P4Vq#)mUS3a6Pghr0 zOG`^oP*5u>Dk>!b9G`+9 z0tlc9A+*|2)CoyIln!=HNG~X%dVN%b;V6#B$_QFd5@Kql#GTF4Y_X&-G9v)U)q1nt zrTPAFJe7ttf|NOD{Cv6I?xj78Awg?E&OY@}7zI@Yy;b;S{XfD33DgOlg`)U)00000 LNkvXXu0mjfK7_A_ diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/cautery.png b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/cautery.png deleted file mode 100644 index 4c899a2bea382ea39a6e272ea5c8737feaab921f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*%slh|%$fh6QkAY> zzwYJbbC_ViJc9B3{$l=mUNsl4GMC3rX?w< z$)!-(J5`kRVU1#{vWgxvbAYMQ^n>o;3c{CO2^9G!m{H_R4f z5Hy|n>bCEe4G+1K=kQ#xxwX?{217>s#*l<;Tc#&dIxA)!6t+yC_nKc*=3n@XEgv@u zcpSgHh TNkzs$H!*m+`njxgN@xNAMYL^I diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/hemostat.png b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/hemostat.png deleted file mode 100644 index 1de7392928430e10380337296867c6c688f24d90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*Oqnue`}XZADJi>( z?r#N(GnNGT1v5B2yO9Ru7bqCXp n6OJY<={eZY{_sG9I0M6*M6T-I1&0fOdKo-j{an^LB{Ts5=Tj|S diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/meta.json deleted file mode 100644 index e5e2f55219..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/meta.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "scalpel" - }, - { - "name": "retractor" - }, - { - "name": "bone_saw" - }, - { - "name": "hemostat" - }, - { - "name": "drill" - }, - { - "name": "cautery" - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/retractor.png b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/retractor.png deleted file mode 100644 index e207d8f12fb8c71df8b5bd5842adfc0aac1488a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*Oqnue^XARVmM!b- z?99#0Ww`TtF;JGVB*-tA!Qt7BG$5zI)5S4FV`6fGL`p-TfUkpxCxdT8;{=8_NuHh; zOiUVGGkSYjB_`?`iHM|#I2cWrJR#(^?ZgB|m4*~H7lxA_jDMJP^b}-!*f<(5I4H<_ zvU_V>n0SbTm4{~y(~6n}Re>RP%-JiLXZahl#9Uzgz{n7#$G-CC&;8jzyBR!P{an^L HB{Ts5H-|!2 diff --git a/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/scalpel.png b/Resources/Textures/Objects/Specific/Medical/surgery_tools.rsi/scalpel.png deleted file mode 100644 index 56150cc16c3d93b07a1326f4046959dc778db3a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmV-c0jd6pP)=e90qhb@TiZLf?LP)r~ z#t#y>ov{cW7T%#CUNh4y>@GXM*@b0SS(b$)!$>r{00bZa0SG_<0uX=z0HopuudeU- zD1f*`#bODU7iYMCc#3RurzgLjI|C7=my5rh5`RpcZoN^@hdVInH30z5=T|tX+j&8| z-Gc9X7>{3JnkM@FUfBA+2giBGXf#X*K>)2am>I+b(hOz-GeZ+0lgVN+pTRH;5D{$K z&MO6|^|O4v3pdpYm=u1#J-Dv>j~hHkRx+8q?No78sLg-D=1~+1=V5=X_87a!ZKbRZ o0@wyQM3TJ$$Be}90RaeL1=Ns*cn`r=9RL6T07*qoM6N<$f;nf1C;$Ke diff --git a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/meta.json deleted file mode 100644 index 0f08d50f9d..0000000000 --- a/Resources/Textures/Objects/Specific/Morgue/bodybags.rsi/meta.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 39659000f380583c35fb814ee2fadab24c2f8076", - "states": [ - { - "name": "bag", - - }, - { - "name": "item", - - }, - { - "name": "label_overlay", - - }, - { - "name": "open_overlay", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/meta.json b/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/meta.json deleted file mode 100644 index 620ca38f51..0000000000 --- a/Resources/Textures/Objects/Specific/Morgue/morgue.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 31d88c7454e429a64fbae4a9f7b4aecaf838e9a1", - "states": [ - { - "name": "crema_active_light", - "directions": 4 - }, - { - "name": "crema_closed", - "directions": 4 - }, - { - "name": "crema_contents_light", - "directions": 4 - }, - { - "name": "crema_open", - "directions": 4 - }, - { - "name": "crema_tray", - "directions": 4 - }, - { - "name": "morgue_closed", - "directions": 4 - }, - { - "name": "morgue_nomob_light", - "directions": 4 - }, - { - "name": "morgue_nosoul_light", - "directions": 4 - }, - { - "name": "morgue_open", - "directions": 4 - }, - { - "name": "morgue_soul_light", - "directions": 4 - }, - { - "name": "morgue_tray", - "directions": 4 - } - ] -}