From 20237416918e4700f2eaf15a66ead0bea5ffc962 Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 14 Mar 2021 23:46:17 +0000 Subject: [PATCH] Slight reorganization of yaml files (#3628) * Initial * Applied reviews * HELLO YOU FUCK --- .../Specific}/traitordm.yml | 0 .../Entities/{ => Debugging}/clicktest.yml | 0 .../Entities/Debugging/stress_test.yml | 7 + .../Entities/{ => Effects}/puddle.yml | 0 .../Entities/{ => Effects}/radiation.yml | 0 .../Objects/Specific/Medical/healing.yml | 44 ++++ .../{ => Specific/Medical}/hypospray.yml | 0 .../Objects/Specific/Medical/medkits.yml | 93 +++++++++ .../Objects/Specific/{ => Medical}/morgue.yml | 0 .../{Tools => Specific/Medical}/surgery.yml | 0 .../Entities/Objects/Specific/medical.yml | 188 ------------------ .../Entities/{ => Objects}/base_item.yml | 0 12 files changed, 144 insertions(+), 188 deletions(-) rename Resources/Prototypes/Entities/{ => Constructible/Specific}/traitordm.yml (100%) rename Resources/Prototypes/Entities/{ => Debugging}/clicktest.yml (100%) create mode 100644 Resources/Prototypes/Entities/Debugging/stress_test.yml rename Resources/Prototypes/Entities/{ => Effects}/puddle.yml (100%) rename Resources/Prototypes/Entities/{ => Effects}/radiation.yml (100%) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml rename Resources/Prototypes/Entities/Objects/{ => Specific/Medical}/hypospray.yml (100%) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml rename Resources/Prototypes/Entities/Objects/Specific/{ => Medical}/morgue.yml (100%) rename Resources/Prototypes/Entities/Objects/{Tools => Specific/Medical}/surgery.yml (100%) delete mode 100644 Resources/Prototypes/Entities/Objects/Specific/medical.yml rename Resources/Prototypes/Entities/{ => Objects}/base_item.yml (100%) diff --git a/Resources/Prototypes/Entities/traitordm.yml b/Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml similarity index 100% rename from Resources/Prototypes/Entities/traitordm.yml rename to Resources/Prototypes/Entities/Constructible/Specific/traitordm.yml diff --git a/Resources/Prototypes/Entities/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml similarity index 100% rename from Resources/Prototypes/Entities/clicktest.yml rename to Resources/Prototypes/Entities/Debugging/clicktest.yml diff --git a/Resources/Prototypes/Entities/Debugging/stress_test.yml b/Resources/Prototypes/Entities/Debugging/stress_test.yml new file mode 100644 index 0000000000..979e2c7cd0 --- /dev/null +++ b/Resources/Prototypes/Entities/Debugging/stress_test.yml @@ -0,0 +1,7 @@ +- type: entity + id: StressTest + name: stress test + components: + - type: Sprite + texture: Effects/explosion.rsi/explosion.png + - type: StressTestMovement diff --git a/Resources/Prototypes/Entities/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml similarity index 100% rename from Resources/Prototypes/Entities/puddle.yml rename to Resources/Prototypes/Entities/Effects/puddle.yml diff --git a/Resources/Prototypes/Entities/radiation.yml b/Resources/Prototypes/Entities/Effects/radiation.yml similarity index 100% rename from Resources/Prototypes/Entities/radiation.yml rename to Resources/Prototypes/Entities/Effects/radiation.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml new file mode 100644 index 0000000000..5f0c26887b --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -0,0 +1,44 @@ +- type: entity + name: ointment + description: "Used to treat those nasty burns." + parent: BaseItem + id: Ointment + components: + - type: Sprite + sprite: Objects/Specific/Medical/medical.rsi + state: ointment + - type: Healing + heal: + Heat: 10 + - type: Stack + stackType: Ointment + max: 5 + count: 5 + +- type: entity + name: bruise pack + description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma." + parent: Ointment + id: Brutepack + components: + - type: Sprite + state: brutepack + - type: Healing + heal: + Blunt: 10 + - type: Stack + stackType: Brutepack + +- type: entity + name: roll of gauze + description: "Some sterile gauze to wrap around bloody stumps." + parent: Ointment + id: Gauze + components: + - type: Sprite + state: gauze + - type: Healing + heal: + Blunt: 10 + - type: Stack + stackType: Gauze diff --git a/Resources/Prototypes/Entities/Objects/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/hypospray.yml rename to Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml new file mode 100644 index 0000000000..c0043ba0fa --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -0,0 +1,93 @@ +- type: entity + name: first aid kit + description: It's an emergency medical kit for those serious boo-boos. + parent: BaseItem + id: Medkit + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + netsync: false + state: firstaid + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: firstaid + +- type: entity + name: burn treatment kit + description: "A specialized medical kit for when the toxins lab *spontaneously* burns down." + parent: Medkit + id: MedkitBurn + components: + - type: Sprite + state: burnkit + - type: Item + HeldPrefix: burnkit + +- type: entity + name: toxin treatment kit + description: "Used to treat toxic blood content." + parent: Medkit + id: MedkitToxin + components: + - type: Sprite + state: toxinkit + - type: Item + HeldPrefix: toxinkit + +- type: entity + name: oxygen deprivation treatment kit + description: "A box full of oxygen goodies." + parent: Medkit + id: MedkitO2 + components: + - type: Sprite + state: o2kit + - type: Item + HeldPrefix: o2kit + +- type: entity + name: brute trauma treatment kit + description: "A first aid kit for when you get toolboxed." + parent: Medkit + id: MedkitBrute + components: + - type: Sprite + state: brutekit + - type: Item + HeldPrefix: brutekit + +- type: entity + name: advanced first aid kit + description: "An advanced kit to help deal with advanced wounds." + parent: Medkit + id: MedkitAdvanced + components: + - type: Sprite + state: advkit + - type: Item + HeldPrefix: advkit + +- type: entity + name: radiation treatment kit + description: "If you took your Rad-X you wouldn't need this." + parent: Medkit + id: MedkitRadiation + components: + - type: Sprite + state: radkit + - type: Item + HeldPrefix: radkit + +- type: entity + name: combat medical kit + description: "For the big weapons among us." + parent: Medkit + id: MedkitCombat + components: + - type: Sprite + state: blackkit + - type: Item + HeldPrefix: blackkit diff --git a/Resources/Prototypes/Entities/Objects/Specific/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Specific/morgue.yml rename to Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml diff --git a/Resources/Prototypes/Entities/Objects/Tools/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Tools/surgery.yml rename to Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml deleted file mode 100644 index dfeb50fb05..0000000000 --- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml +++ /dev/null @@ -1,188 +0,0 @@ -- type: entity - name: medical stack - id: MedicalStack - parent: BaseItem - abstract: true - components: - - type: Item - - type: Healing - -- type: entity - name: ointment - description: "Used to treat those nasty burns." - parent: MedicalStack - id: Ointment - components: - - type: Sprite - sprite: Objects/Specific/Medical/medical.rsi - state: ointment - - type: Healing - heal: - Heat: 10 - - type: Stack - stackType: Ointment - max: 5 - count: 5 - -- type: entity - name: bruise pack - description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma." - parent: MedicalStack - id: Brutepack - components: - - type: Sprite - sprite: Objects/Specific/Medical/medical.rsi - state: brutepack - - type: Healing - heal: - Blunt: 10 - - type: Stack - stackType: Brutepack - max: 5 - count: 5 - -- type: entity - name: roll of gauze - description: "Some sterile gauze to wrap around bloody stumps." - parent: MedicalStack - id: Gauze - components: - - type: Sprite - sprite: Objects/Specific/Medical/medical.rsi - state: gauze - - type: Healing - heal: - Blunt: 10 - - type: Stack - stackType: Gauze - max: 5 - count: 5 -#first aid kit entities. See catalog/fills/firstaidkits for contents -- type: entity - name: first aid kit - description: It's an emergency medical kit for those serious boo-boos. - parent: BaseItem - id: Medkit - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: firstaid - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: firstaid - - -- type: entity - name: burn treatment kit - description: "A specialized medical kit for when the toxins lab *spontaneously* burns down." - parent: BaseItem - id: MedkitBurn - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: burnkit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: burnkit - -- type: entity - name: toxin treatment kit - description: "Used to treat toxic blood content." - parent: BaseItem - id: MedkitToxin - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: toxinkit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: toxinkit - -- type: entity - name: oxygen deprivation treatment kit - description: "A box full of oxygen goodies." - parent: BaseItem - id: MedkitO2 - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: o2kit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: o2kit - -- type: entity - name: brute trauma treatment kit - description: "A first aid kit for when you get toolboxed." - parent: BaseItem - id: MedkitBrute - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: brutekit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: brutekit - -- type: entity - name: advanced first aid kit - description: "An advanced kit to help deal with advanced wounds." - parent: BaseItem - id: MedkitAdvanced - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: advkit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: advkit - -- type: entity - name: radiation treatment kit - description: "If you took your Rad-X you wouldn't need this." - parent: BaseItem - id: MedkitRadiation - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: radkit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: radkit - -- type: entity - name: combat medical kit - description: "For the big weapons among us." - parent: BaseItem - id: MedkitCombat - components: - - type: Sprite - sprite: Objects/Specific/Medical/firstaidkits.rsi - state: blackkit - - type: Storage - capacity: 50 - - type: Item - size: 5 - sprite: Objects/Specific/Medical/firstaidkits.rsi - HeldPrefix: blackkit diff --git a/Resources/Prototypes/Entities/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml similarity index 100% rename from Resources/Prototypes/Entities/base_item.yml rename to Resources/Prototypes/Entities/Objects/base_item.yml