diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/chemistry.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/chemistry.ftl new file mode 100644 index 00000000000..7211bc31bd8 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/chemistry.ftl @@ -0,0 +1,6 @@ +ent-ReliableContainer = надежный контейнер + .desc = Продвинутый контейнер для хранения медицинских препаратов. +ent-ReliableContainerBruteFilled = надежный контейнер от мех-повреждений + .desc = Наполнен лекарствами, которые лечат серьезные повреждения. +ent-ReliableContainerBurnFilled = надежный контейнер от физ-повреждений + .desc = Наполнен лекарствами, которые лечат ожоги. \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Items/firstaidkits.yml index dcb0e778d0a..16101d37a04 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Items/firstaidkits.yml @@ -9,10 +9,8 @@ amount: 2 - id: RegenerativeMesh amount: 2 - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 + - id: ReliableContainerBruteFilled + - id: ReliableContainerBurnFilled - id: SpaceMedipen amount: 2 - id: Bloodpack diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Fun/cards.yml b/Resources/Prototypes/Corvax/Entities/Objects/Fun/cards.yml index 95b6795c421..073fc08c94f 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Fun/cards.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Fun/cards.yml @@ -5,9 +5,6 @@ description: A poker card with you can play. noSpawn: true components: - - type: SpawnItemsOnUse - items: - - id: BasePokerCardFlipped - type: Item size: Tiny - type: Tag @@ -20,7 +17,8 @@ layers: - state: background - state: cover - - type: CargoSellBlacklist + - type: StaticPrice + price: 1 - type: entity name: playable card @@ -29,9 +27,6 @@ description: A poker card with you can play. noSpawn: true components: - - type: SpawnItemsOnUse - items: - - id: BasePokerCard - type: Sprite sprite: Corvax/Objects/Fun/Cards/poker_cards.rsi scale: 0.5,0.5 @@ -39,7 +34,6 @@ - state: background - state: cover - state: logo - - type: CargoSellBlacklist - type: entity name: playable card @@ -1936,9 +1930,6 @@ description: A poker card with you can play. noSpawn: true components: - - type: SpawnItemsOnUse - items: - - id: BasePokerCardClassicFlipped - type: Item size: Tiny - type: Tag @@ -1951,7 +1942,8 @@ layers: - state: background - state: cover - - type: CargoSellBlacklist + - type: StaticPrice + price: 1 - type: entity name: playable card @@ -1960,9 +1952,6 @@ description: A poker card with you can play. noSpawn: true components: - - type: SpawnItemsOnUse - items: - - id: BasePokerCardClassic - type: Sprite sprite: Corvax/Objects/Fun/Cards/poker_cards_classic.rsi scale: 0.5,0.5 @@ -1970,7 +1959,6 @@ - state: background - state: cover - state: logo - - type: CargoSellBlacklist - type: entity name: playable card diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Corvax/Entities/Objects/Specific/chemistry.yml new file mode 100644 index 00000000000..a4e65807a04 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Specific/chemistry.yml @@ -0,0 +1,93 @@ +- type: entity + name: reliable container + parent: BaseItem + description: "Advanced container for storing medical products." + id: ReliableContainer + components: + - type: Sprite + sprite: Corvax/Objects/Specific/Chemistry/kit.rsi + layers: + - state: kit + - state: fill1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Item + sprite: Corvax/Objects/Specific/Chemistry/kit.rsi + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 100 + - type: MixableSolution + solution: beaker + - type: FitsInDispenser + solution: beaker + - type: RefillableSolution + solution: beaker + - type: DrainableSolution + solution: beaker + - type: ExaminableSolution + solution: beaker + - type: DrawableSolution + solution: beaker + - type: InjectableSolution + solution: beaker + - type: SolutionTransfer + canChangeTransferAmount: true + - type: SolutionItemStatus + solution: beaker + - type: UserInterface + interfaces: + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface + - type: Drink + solution: beaker + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: PhysicalComposition + materialComposition: + Glass: 100 + - type: StaticPrice + price: 30 + +- type: entity + name: brute reliable container + parent: ReliableContainer + description: "Filled with medication that treat brute damage." + id: ReliableContainerBruteFilled + components: + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 100 + reagents: + - ReagentId: Bicaridine + Quantity: 75 + - ReagentId: TranexamicAcid + Quantity: 25 + +- type: entity + name: burn reliable container + parent: ReliableContainer + description: "Filled with medication that treat burn damage." + id: ReliableContainerBurnFilled + components: + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 100 + reagents: + - ReagentId: Dermaline + Quantity: 50 + - ReagentId: Leporazine + Quantity: 50 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 77d65791a76..ea3b33042d7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -10,6 +10,7 @@ sprite: Objects/Specific/Medical/medical.rsi heldPrefix: ointment # Inherited + - type: Appearance - type: StaticPrice price: 0 @@ -24,7 +25,9 @@ tags: - Ointment - type: Sprite - state: ointment + layers: + - state: ointment + map: ["base"] - type: Item heldPrefix: ointment - type: Healing @@ -42,6 +45,14 @@ path: "/Audio/Items/Medical/ointment_end.ogg" - type: Stack stackType: Ointment + baseLayer: base + layerStates: + - ointment + - ointment_1 + - ointment_2 + - ointment_3 + - ointment_4 + - ointment_5 count: 10 - type: StackPrice price: 5 @@ -75,7 +86,9 @@ tags: - Ointment - type: Sprite - state: regenerative-mesh + layers: + - state: regenerative-mesh + map: ["base"] - type: Item heldPrefix: regenerative-mesh - type: Healing @@ -88,11 +101,21 @@ Shock: -10 Caustic: -10 healingBeginSound: - path: "/Audio/Items/Medical/ointment_begin.ogg" + path: "/Audio/Items/Medical/brutepack_begin.ogg" healingEndSound: - path: "/Audio/Items/Medical/ointment_end.ogg" + path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: RegenerativeMesh + baseLayer: base + layerStates: + - regenerative-mesh + - regenerative-mesh_1 + - regenerative-mesh_2 + - regenerative-mesh_3 + - regenerative-mesh_4 + - regenerative-mesh_5 + - regenerative-mesh_6 + - regenerative-mesh_7 count: 10 - type: StackPrice price: 20 @@ -117,7 +140,9 @@ tags: - Brutepack - type: Sprite - state: brutepack + layers: + - state: brutepack + map: ["base"] - type: Healing damageContainers: - Biological @@ -130,6 +155,14 @@ path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: Brutepack + baseLayer: base + layerStates: + - brutepack + - brutepack_1 + - brutepack_2 + - brutepack_3 + - brutepack_4 + - brutepack_5 count: 10 - type: StackPrice price: 5 @@ -163,7 +196,9 @@ tags: - Brutepack - type: Sprite - state: medicated-suture + layers: + - state: medicated-suture + map: ["base"] - type: Item heldPrefix: medicated-suture storedRotation: -90 @@ -180,6 +215,12 @@ path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: MedicatedSuture + baseLayer: base + layerStates: + - medicated-suture + - medicated-suture_1 + - medicated-suture_2 + - medicated-suture_3 count: 10 - type: StackPrice price: 20 @@ -279,7 +320,9 @@ tags: - Gauze - type: Sprite - state: gauze + layers: + - state: gauze + map: ["base"] - type: Construction graph: Gauze node: gauze @@ -297,6 +340,13 @@ path: "/Audio/Items/Medical/brutepack_end.ogg" - type: Stack stackType: Gauze + baseLayer: base + layerStates: + - gauze + - gauze_1 + - gauze_2 + - gauze_3 + - gauze_4 count: 10 - type: StackPrice price: 5 @@ -321,14 +371,19 @@ - type: entity name: aloe cream description: A topical cream for burns. - parent: Ointment ##Yes it's a direct reskin + parent: Ointment ##Yes it's a direct reskin (WTF! - zekins3366) id: AloeCream components: - type: Sprite sprite: Objects/Specific/Hydroponics/aloe.rsi - state: cream + layers: + - state: cream + map: ["base"] - type: Stack stackType: AloeCream + baseLayer: base + layerStates: + - cream count: 10 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 6fdb77fe5fc..78899b6f25b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -22,7 +22,7 @@ visible: false - type: Appearance - type: SolutionContainerVisuals - maxFillLevels: 6 + maxFillLevels: 5 # Corvax-Frontier fillBaseName: bottle-1- - type: Drink - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index dd6314e3569..5662c05a29a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -51,7 +51,7 @@ solution: beaker - type: Appearance - type: SolutionContainerVisuals - maxFillLevels: 6 + maxFillLevels: 9 # Corvax-Frontier fillBaseName: beaker - type: Damageable damageContainer: Inorganic @@ -172,7 +172,7 @@ # materialComposition: # Glass: 50 - type: SolutionContainerVisuals - maxFillLevels: 6 + maxFillLevels: 9 # Corvax-Frontier fillBaseName: beaker inHandsMaxFillLevels: 3 inHandsFillBaseName: -fill- @@ -215,7 +215,7 @@ maxVol: 100 - type: Appearance - type: SolutionContainerVisuals - maxFillLevels: 6 + maxFillLevels: 9 # Corvax-Frontier fillBaseName: beakerlarge inHandsMaxFillLevels: 4 inHandsFillBaseName: -fill- @@ -519,3 +519,18 @@ storageInsertSound: /Audio/Effects/pill_insert.ogg storageRemoveSound: /Audio/Effects/pill_remove.ogg - type: Dumpable + - type: RandomSprite # Corvax-Frontier + available: + - 0: + pill_black: "" + pill_blue: "" + pill_canister: "" + pill_dred: "" + pill_green: "" + pill_lred: "" + pill_orange: "" + pill_pink: "" + pill_rainbow: "" + pill_red: "" + pill_white: "" + pill_yellow: "" diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill1.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill1.png new file mode 100644 index 00000000000..258d80c17dd Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill1.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill2.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill2.png new file mode 100644 index 00000000000..d622addd3f0 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill2.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill3.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill3.png new file mode 100644 index 00000000000..b6bc9ff303b Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill3.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill4.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill4.png new file mode 100644 index 00000000000..bf2ea755d34 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill4.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill5.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill5.png new file mode 100644 index 00000000000..a25966925ed Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/fill5.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/kit.png b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/kit.png new file mode 100644 index 00000000000..e9865b1f0fd Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/kit.png differ diff --git a/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/meta.json b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/meta.json new file mode 100644 index 00000000000..4c22312e511 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Specific/Chemistry/kit.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "kit" + }, + { + "name": "fill1" + }, + { + "name": "fill2" + }, + { + "name": "fill3" + }, + { + "name": "fill4" + }, + { + "name": "fill5" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/parts.rsi/meta.json b/Resources/Textures/Objects/Materials/parts.rsi/meta.json index 290b7dd91ce..ec5c2871e91 100644 --- a/Resources/Textures/Objects/Materials/parts.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods.png b/Resources/Textures/Objects/Materials/parts.rsi/rods.png index 9b88ebb9964..a727087eba6 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png index f3a53194fd6..4378f7e438e 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png index eef57cbfe9d..698c3269161 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png index 3ac8d6bb16a..3a0fd245f6f 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png index ea5f8ea4eac..83f7f002871 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png index f97ff00c3d1..4fbdb0369bc 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png index ceb623570e7..64d8b3daaf2 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png index 40209c2f669..64d8b3daaf2 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png index 62c4528ae1e..64d8b3daaf2 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png index 489b48b78a0..64514443f13 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png index ca719e883af..64514443f13 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png index 581a50d15f0..97f6ed2508d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker7.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker7.png new file mode 100644 index 00000000000..97f6ed2508d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker7.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker8.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker8.png new file mode 100644 index 00000000000..73458e281e3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker8.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker9.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker9.png new file mode 100644 index 00000000000..f225c3ac0d9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker9.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index 11326a10936..7621aecbafe 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 @@ -63,6 +63,15 @@ { "name": "beaker6" }, + { + "name": "beaker7" + }, + { + "name": "beaker8" + }, + { + "name": "beaker9" + }, { "name": "equipped-BELT", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png index f52a739ad34..9e5fd9803a3 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json index 54a2e31b016..378de81862a 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 @@ -11,8 +11,11 @@ "name": "beakerbluespace", "delays": [ [ - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png index 4e0fb0fc061..a16dfdf2dc1 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png index 5ecf243047e..b75ca3205fe 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png index 05e647f1103..b75ca3205fe 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png index 0a464113d71..b75ca3205fe 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png index c16054a21ac..2e2497812af 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png index 363e3a1bfc0..2e2497812af 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png index 64126589dae..255c4502499 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge7.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge7.png new file mode 100644 index 00000000000..255c4502499 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge7.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge8.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge8.png new file mode 100644 index 00000000000..f76171cc964 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge8.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge9.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge9.png new file mode 100644 index 00000000000..8eb6bbf6784 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge9.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index 9c3c7d203de..609410d0f73 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 @@ -70,6 +70,15 @@ }, { "name": "beakerlarge6" + }, + { + "name": "beakerlarge7" + }, + { + "name": "beakerlarge8" + }, + { + "name": "beakerlarge9" } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png index 037de6fdeeb..fd8fa12b809 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png index 340caf40464..3c42bf29701 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png index 6cff981ad67..e95ea9529df 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png index eda7228dace..197a03ebbcc 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png index 93ea9e5fecd..850d1f88abe 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png deleted file mode 100644 index 5fcb6725a55..00000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png index a90ed4846c4..3692800d55d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png index a90ed4846c4..3692800d55d 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/bottle.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json index 616fc1b571e..559751d4124 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi, other sprites copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 @@ -108,9 +108,6 @@ { "name": "bottle-1-5" }, - { - "name": "bottle-1-6" - }, { "name": "bottle-2-1" }, diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper.png index d10f5b6855e..2222460de60 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper.png and b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png index 999d333ab84..8f287b051a4 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png and b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/dropper1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json index 99b915f2b1e..4681d7165c4 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 @@ -10,6 +10,39 @@ { "name": "pill_canister" }, + { + "name": "pill_black" + }, + { + "name": "pill_blue" + }, + { + "name": "pill_dred" + }, + { + "name": "pill_green" + }, + { + "name": "pill_lred" + }, + { + "name": "pill_orange" + }, + { + "name": "pill_pink" + }, + { + "name": "pill_rainbow" + }, + { + "name": "pill_red" + }, + { + "name": "pill_white" + }, + { + "name": "pill_yellow" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_black.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_black.png new file mode 100644 index 00000000000..01155adccaf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_black.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_blue.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_blue.png new file mode 100644 index 00000000000..d736ada0061 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_blue.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png index 8b00bb5040b..a52e2610260 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_dred.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_dred.png new file mode 100644 index 00000000000..9f75cb19d8c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_dred.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_green.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_green.png new file mode 100644 index 00000000000..daf0340a217 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_green.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_lred.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_lred.png new file mode 100644 index 00000000000..515c7fa4988 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_lred.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_orange.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_orange.png new file mode 100644 index 00000000000..a52e2610260 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_orange.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_pink.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_pink.png new file mode 100644 index 00000000000..14476ce1a46 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_pink.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_rainbow.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_rainbow.png new file mode 100644 index 00000000000..576bff33ae8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_rainbow.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_red.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_red.png new file mode 100644 index 00000000000..64f8ef14bbe Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_red.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_white.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_white.png new file mode 100644 index 00000000000..fed04a1fe5b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_white.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_yellow.png b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_yellow.png new file mode 100644 index 00000000000..fad8b4b8997 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_yellow.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png index 1bd215195f0..80eaabe9881 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_1.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_1.png new file mode 100644 index 00000000000..0d13997dfcb Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_1.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_2.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_2.png new file mode 100644 index 00000000000..1d84e65364a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_3.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_3.png new file mode 100644 index 00000000000..81d88b5fbe4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_3.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_4.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_4.png new file mode 100644 index 00000000000..d11e001efb9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_4.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_5.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_5.png new file mode 100644 index 00000000000..7d49d0b5975 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack_5.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png index 49a1d598408..13a299e4cb2 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_1.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_1.png new file mode 100644 index 00000000000..ad824166924 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_1.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_2.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_2.png new file mode 100644 index 00000000000..54acffafe6f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_3.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_3.png new file mode 100644 index 00000000000..ce59aa0f80a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_3.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_4.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_4.png new file mode 100644 index 00000000000..57d12a45c53 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze_4.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png index e643cda1cc1..2592ab33671 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_1.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_1.png new file mode 100644 index 00000000000..284eaf74cbf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_1.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_2.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_2.png new file mode 100644 index 00000000000..4dff8ebf1d8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_3.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_3.png new file mode 100644 index 00000000000..e643cda1cc1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture_3.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json index e4f039ada9b..dcf675ca33f 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -1,93 +1,163 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi", - "copyright": "Tourniquet Sprite by PoorMansDreams", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser, packs sprites copyright by https://github.com/sojourn-13/sojourn-station", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "brutepack" - }, - { - "name": "brutepack-inhand-left", - "directions": 4 - }, - { - "name": "brutepack-inhand-right", - "directions": 4 - }, - { - "name": "cast" - }, - { - "name": "gauze" - }, + "states": [ + { + "name": "brutepack" + }, + { + "name": "brutepack_1" + }, + { + "name": "brutepack_2" + }, + { + "name": "brutepack_3" + }, + { + "name": "brutepack_4" + }, + { + "name": "brutepack_5" + }, + { + "name": "brutepack-inhand-left", + "directions": 4 + }, + { + "name": "brutepack-inhand-right", + "directions": 4 + }, + { + "name": "cast" + }, + { + "name": "gauze" + }, + { + "name": "gauze_1" + }, + { + "name": "gauze_2" + }, + { + "name": "gauze_3" + }, + { + "name": "gauze_4" + }, { "name": "tourniquet" }, - { - "name": "morphine" - }, - { - "name": "ointment" - }, - { - "name": "ointment-inhand-left", - "directions": 4 - }, - { - "name": "ointment-inhand-right", - "directions": 4 - }, - { - "name": "bloodpack" - }, - { - "name": "medicated-suture" - }, - { - "name": "medicated-suture-inhand-left", - "directions": 4 - }, - { - "name": "medicated-suture-inhand-right", - "directions": 4 - }, - { - "name": "regenerative-mesh" - }, - { - "name": "regenerative-mesh-inhand-right", - "directions": 4 - }, - { - "name": "regenerative-mesh-inhand-left", - "directions": 4 - }, - { - "name": "bloodpack-empty" - }, - { - "name": "bloodpack-liquid-1" - }, - { - "name": "bloodpack-liquid-2" - }, - { - "name": "bloodpack-liquid-3" - }, - { - "name": "bloodpack-liquid-4" - }, - { - "name": "bloodpack-liquid-5" - }, - { - "name": "bloodpack-blue" - } - ] + { + "name": "morphine" + }, + { + "name": "ointment" + }, + { + "name": "ointment_1" + }, + { + "name": "ointment_2" + }, + { + "name": "ointment_3" + }, + { + "name": "ointment_4" + }, + { + "name": "ointment_5" + }, + { + "name": "ointment-inhand-left", + "directions": 4 + }, + { + "name": "ointment-inhand-right", + "directions": 4 + }, + { + "name": "bloodpack" + }, + { + "name": "medicated-suture" + }, + { + "name": "medicated-suture_1" + }, + { + "name": "medicated-suture_2" + }, + { + "name": "medicated-suture_3" + }, + { + "name": "medicated-suture-inhand-left", + "directions": 4 + }, + { + "name": "medicated-suture-inhand-right", + "directions": 4 + }, + { + "name": "regenerative-mesh" + }, + { + "name": "regenerative-mesh_1" + }, + { + "name": "regenerative-mesh_2" + }, + { + "name": "regenerative-mesh_3" + }, + { + "name": "regenerative-mesh_4" + }, + { + "name": "regenerative-mesh_5" + }, + { + "name": "regenerative-mesh_6" + }, + { + "name": "regenerative-mesh_7" + }, + { + "name": "regenerative-mesh-inhand-right", + "directions": 4 + }, + { + "name": "regenerative-mesh-inhand-left", + "directions": 4 + }, + { + "name": "bloodpack-empty" + }, + { + "name": "bloodpack-liquid-1" + }, + { + "name": "bloodpack-liquid-2" + }, + { + "name": "bloodpack-liquid-3" + }, + { + "name": "bloodpack-liquid-4" + }, + { + "name": "bloodpack-liquid-5" + }, + { + "name": "bloodpack-blue" + } + ] } diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png index 413a72304cc..42fcf55380f 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_1.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_1.png new file mode 100644 index 00000000000..a545575afec Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_1.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_2.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_2.png new file mode 100644 index 00000000000..31f0cdc7b5b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_3.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_3.png new file mode 100644 index 00000000000..f5fd4328323 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_3.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_4.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_4.png new file mode 100644 index 00000000000..64b3cfcdeff Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_4.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_5.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_5.png new file mode 100644 index 00000000000..d933094fcab Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/ointment_5.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png index 49b2bbe8fab..defdca8fcd1 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_1.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_1.png new file mode 100644 index 00000000000..6e62267886b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_1.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_2.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_2.png new file mode 100644 index 00000000000..1e3c6f9b5c1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_2.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_3.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_3.png new file mode 100644 index 00000000000..0b8dae2794e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_3.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_4.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_4.png new file mode 100644 index 00000000000..142f415c87d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_4.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_5.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_5.png new file mode 100644 index 00000000000..813b8b1334e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_5.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_6.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_6.png new file mode 100644 index 00000000000..3af1812dcc3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_6.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_7.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_7.png new file mode 100644 index 00000000000..5b60e3ac643 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh_7.png differ