From: KittenColony <149278380+KittenColony@users.noreply.github.com> Date: Thu, 21 Dec 2023 07:35:47 +0000 (+1300) Subject: Gauze Markings 2 - Medical Boogaloo (#22452) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=eac8796fad85bc340f8b403fb04cdecc5f680bdc;p=space-station-14.git Gauze Markings 2 - Medical Boogaloo (#22452) * renamed leg wrap to thigh wrap * gauze species rework pt. 1 attempt 73 I hate it here please god get me out * fixing lizard foot wraps part 80 * Attempt 80 to get lizard markings to work i fucking hate it here someone help me D: * attempt 82 im crying please work now * made gauze eye pads actually tape on * Handwraps added * fixed lizard foot wraps (again) 84. * attempt 83.5 * attempt 84 please work * added blindfold gauze * fixed boxerwrap_r :greenfrog: * fixed @ubaserB's eye scars * Revert "fixed @ubaserB's eye scars" This reverts commit eb364e1e61c03c2b8567fec8c1a5c6c78c9a333c. * Revert "Revert "fixed @ubaserB's eye scars"" This reverts commit ac1ee343ae2a8adb2569f88b81cc4afc6915f220. --- diff --git a/Resources/Locale/en-US/markings/gauze.ftl b/Resources/Locale/en-US/markings/gauze.ftl index 5a1c721b59..9a45a0a2fa 100644 --- a/Resources/Locale/en-US/markings/gauze.ftl +++ b/Resources/Locale/en-US/markings/gauze.ftl @@ -28,6 +28,11 @@ marking-GauzeLeftArm = Gauze Arm Wrap (Left) marking-GauzeLowerLegLeft-gauze_lowerleg_l = Gauze Ankle Wrap (Left) marking-GauzeLowerLegLeft = Gauze Ankle Wrap (Left) +marking-GauzeBoxerWrapLeft-gauze_boxerwrap_l = Gauze Handwrap (Left) +marking-GauzeBoxerWrapLeft = Gauze Handwrap (Left) + +marking-GauzeBoxerWrapRight-gauze_boxerwrap_r = Gauze Handwrap (Right) +marking-GauzeBoxerWrapRight = Gauze Handwrap (Right) marking-GauzeUpperLegLeft-gauze_upperleg_l = Gauze Thigh Wrap (Left) marking-GauzeUpperLegLeft = Gauze Thigh Wrap (Left) @@ -35,6 +40,23 @@ marking-GauzeUpperLegLeft = Gauze Thigh Wrap (Left) marking-GauzeLowerLegRight-gauze_lowerleg_r = Gauze Ankle Wrap (Right) marking-GauzeLowerLegRight = Gauze Ankle Wrap (Right) +marking-GauzeUpperLegRight-gauze_upperleg_r = Gauze Thigh Wrap (Right) +marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right) + +marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold +marking-GauzeBlindfold = Gauze Blindfold + +marking-GauzeLizardBlindfold-gauze_lizardblindfold = Gauze Blindfold +marking-GauzeLizardBlindfold = Gauze Blindfold + +marking-GauzeLizardFootRight-gauze_lizardfoot_r = Gauze Foot Wrap (Right) +marking-GauzeLizardFootRight = Gauze Foot Wrap (Right) + +marking-GauzeLizardFootLeft-gauze_lizardfoot_l = Gauze Foot Wrap (Left) +marking-GauzeLizardFootLeft = Gauze Foot Wrap (Left) + +marking-GauzeLizardLefteyePatch-gauze_lizardlefteye = Adjusted Gauze eyepatch (Left) +marking-GauzeLizardLefteyePatch = Adjusted Gauze eyepatch (Left) -marking-GauzeUpperLegRight-gauze_upperleg_r = Gauze Leg Wrap (Right) -marking-GauzeUpperLegRight = Gauze Leg Wrap (Right) \ No newline at end of file +marking-GauzeLizardRighteyePatch-gauze_lizardrighteye = Adjusted Gauze eyepatch (Right) +marking-GauzeLizardRighteyePatch = Adjusted Gauze Eyepatch (Right) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 3815b4c9b6..407ea1c7ba 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid] coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid] coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyeTape bodyPart: Eyes markingCategory: Head - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -54,11 +54,25 @@ - sprite: Mobs/Customization/gauze.rsi state: gauze_righteye_1 +- type: marking + id: GauzeBlindfold + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Moth, Dwarf, Human, Arachnid] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_blindfold + - type: marking id: GauzeShoulder bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -72,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Chest - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -86,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -100,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -114,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Arms - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -128,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid] coloring: default: type: @@ -142,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -156,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] coloring: default: type: @@ -170,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid, SlimePerson] + speciesRestriction: [Moth, Dwarf, Human, Arachnid] coloring: default: type: @@ -179,4 +193,103 @@ sprites: - sprite: Mobs/Customization/gauze.rsi state: gauze_lowerleg_r + +- type: marking + id: GauzeBoxerWrapRight + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_boxerwrap_r + +- type: marking + id: GauzeBoxerWrapLeft + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_boxerwrap_l + +# Lizard Specific Markings +- type: marking + id: GauzeLizardLefteyePatch + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Reptilian] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_lizardlefteye + +- type: marking + id: GauzeLizardRighteyePatch + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Reptilian] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_lizardrighteye + +- type: marking + id: GauzeLizardFootRight + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [Reptilian] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_lizardfoot_r + +- type: marking + id: GauzeLizardFootLeft + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [Reptilian] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_lizardfoot_l + +- type: marking + id: GauzeLizardBlindfold + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Reptilian] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Mobs/Customization/gauze.rsi + state: gauze_lizardblindfold diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_blindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_blindfold.png new file mode 100644 index 0000000000..3ac3d34d17 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_blindfold.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_l.png new file mode 100644 index 0000000000..f5b01c7d04 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_l.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_r.png new file mode 100644 index 0000000000..d2658219a2 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_boxerwrap_r.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_1.png index fa54028ecd..bad1df5067 100644 Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_1.png and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lefteye_1.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png new file mode 100644 index 0000000000..c892f9e924 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardblindfold.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png new file mode 100644 index 0000000000..436b1ceea0 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_l.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png new file mode 100644 index 0000000000..90176db11e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardfoot_r.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png new file mode 100644 index 0000000000..d62920480a Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardlefteye.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png new file mode 100644 index 0000000000..ac3ed19698 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_lizardrighteye.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_righteye_1.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_righteye_1.png index 73729482c6..74cf65e4cf 100644 Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_righteye_1.png and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_righteye_1.png differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json index da08e24616..232e7b0b22 100644 --- a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json @@ -58,6 +58,38 @@ { "name": "gauze_lowerleg_l", "directions": 4 - } + }, + { + "name": "gauze_boxerwrap_r", + "directions": 4 + }, + { + "name": "gauze_boxerwrap_l", + "directions": 4 + }, + { + "name": "gauze_blindfold", + "directions": 4 + }, + { + "name": "gauze_lizardblindfold", + "directions": 4 + }, + { + "name": "gauze_lizardrighteye", + "directions": 4 + }, + { + "name": "gauze_lizardlefteye", + "directions": 4 + }, + { + "name": "gauze_lizardfoot_r", + "directions": 4 + }, + { + "name": "gauze_lizardfoot_l", + "directions": 4 + } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left.png index 3bfa12f121..7d5891f0c8 100644 Binary files a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left.png and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_left.png differ diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right.png index 7d5891f0c8..3bfa12f121 100644 Binary files a/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right.png and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_eye_right.png differ