Merge pull request #1304 from hivehum/snail-markings

every gastropoid marking broke

Resources/Locale/en-US/_Impstation/markings/gastropoid.ftl

@@ -1,68 +1,68 @@
-marking-SnailAltHead-alt_head = Lobster Face
-marking-SnailAltHead = Lobster Face
+marking-GastropoidAltHead-alt_head = Lobster Face
+marking-GastropoidAltHead = Lobster Face
 
-marking-SnailFaceEyes1-face_eyes_1 = Predator
-marking-SnailFaceEyes1 = Predator
+marking-GastropoidFaceEyes1-face_eyes_1 = Predator
+marking-GastropoidFaceEyes1 = Predator
 
-marking-SnailFaceEyes2-face_eyes_2 = Prey
-marking-SnailFaceEyes2 = Prey
+marking-GastropoidFaceEyes2-face_eyes_2 = Prey
+marking-GastropoidFaceEyes2 = Prey
 
-marking-SnailFaceEyes3-face_eyes_3 = Tentacle Eyes
-marking-SnailFaceEyes3 = Tentacle Eyes
+marking-GastropoidFaceEyes3-face_eyes_3 = Tentacle Eyes
+marking-GastropoidFaceEyes3 = Tentacle Eyes
 
-marking-SnailSpotsHeadLeft-spots_head_left = Spots (Left)
-marking-SnailSpotsHeadLeft = Spots (Left)
+marking-GastropoidSpotsHeadLeft-spots_head_left = Spots (Left)
+marking-GastropoidSpotsHeadLeft = Spots (Left)
 
-marking-SnailSpotsHeadRight-spots_head_right = Spots (Right)
-marking-SnailSpotsHeadRight = Spots (Right)
+marking-GastropoidSpotsHeadRight-spots_head_right = Spots (Right)
+marking-GastropoidSpotsHeadRight = Spots (Right)
 
-marking-SnailStripesHead-stripes_head = Stripes
-marking-SnailStripesHead = Stripes
+marking-GastropoidStripesHead-stripes_head = Stripes
+marking-GastropoidStripesHead = Stripes
 
-marking-SnailTentacleBeard-tentacle_beard = Tentacle Beard
-marking-SnailTentacleBeard = Tentacle Beard
+marking-GastropoidTentacleBeard-tentacle_beard = Tentacle Beard
+marking-GastropoidTentacleBeard = Tentacle Beard
 
-marking-SnailTentacleMoustache-tentacle_moustache = Tentacle Moustage
-marking-SnailTentacleMoustache = Tentacle Moustage
+marking-GastropoidTentacleMoustache-tentacle_moustache = Tentacle Moustage
+marking-GastropoidTentacleMoustache = Tentacle Moustage
 
-marking-SnailShellBig-shell_big = Big Shell
-marking-SnailShellBig = Big Shell
+marking-GastropoidShellBig-shell_big = Big Shell
+marking-GastropoidShellBig = Big Shell
 
-marking-SnailShellBigStripes-shell_big_stripes = Stripes (for Big Shell)
-marking-SnailShellBigStripes = Stripes (for Big Shell)
+marking-GastropoidShellBigStripes-shell_big_stripes = Stripes (for Big Shell)
+marking-GastropoidShellBigStripes = Stripes (for Big Shell)
 
-marking-SnailShellSmall-shell_small = Small Shell
-marking-SnailShellSmall = Small Shell
+marking-GastropoidShellSmall-shell_small = Small Shell
+marking-GastropoidShellSmall = Small Shell
 
-marking-SnailShellSmallStripes-shell_small_stripes = Stripes (for Small Shell)
-marking-SnailShellSmallStripes = Stripes (for Small Shell)
+marking-GastropoidShellSmallStripes-shell_small_stripes = Stripes (for Small Shell)
+marking-GastropoidShellSmallStripes = Stripes (for Small Shell)
 
-marking-SnailShellCone-hll_cone = Cone Shell
-marking-SnailShellCone = Cone Shell
+marking-GastropoidShellCone-hll_cone = Cone Shell
+marking-GastropoidShellCone = Cone Shell
 
-marking-SnailPuff1-puff_1 = Doohickey
-marking-SnailPuff1 = Doohickey
+marking-GastropoidPuff1-puff_1 = Doohickey
+marking-GastropoidPuff1 = Doohickey
 
-marking-SnailPuff2-puff_2 = Spurs
-marking-SnailPuff2 = Spurs
+marking-GastropoidPuff2-puff_2 = Spurs
+marking-GastropoidPuff2 = Spurs
 
-marking-SnailStripesBody-stripes_body = Stripes
-marking-SnailStripesBody = Stripes
+marking-GastropoidStripesBody-stripes_body = Stripes
+marking-GastropoidStripesBody = Stripes
 
-marking-SnailVertStripes-vert_stripes = Streaks
-marking-SnailVertStripes = Streaks
+marking-GastropoidVertStripes-vert_stripes = Streaks
+marking-GastropoidVertStripes = Streaks
 
-marking-SnailSpotsBody-spots_body = Spots
-marking-SnailSpotsBody = Spots
+marking-GastropoidSpotsBody-spots_body = Spots
+marking-GastropoidSpotsBody = Spots
 
-marking-SnailSpotsArmLeft-spots_arm_left = Spots (Left)
-marking-SnailSpotsArmLeft = Spots (Left)
+marking-GastropoidSpotsArmLeft-spots_arm_left = Spots (Left)
+marking-GastropoidSpotsArmLeft = Spots (Left)
 
-marking-SnailStripesArmLeft-stripes_arm_left = Stripes (Left)
-marking-SnailStripesArmLeft = Stripes (Left)
+marking-GastropoidStripesArmLeft-stripes_arm_left = Stripes (Left)
+marking-GastropoidStripesArmLeft = Stripes (Left)
 
-marking-SnailSpotsArmRight-spots_arm_right = Spots (Right)
-marking-SnailSpotsArmRight = Spots (Right)
+marking-GastropoidSpotsArmRight-spots_arm_right = Spots (Right)
+marking-GastropoidSpotsArmRight = Spots (Right)
 
-marking-SnailStripesArmRight-stripes_arm_right = Stripes (Right)
-marking-SnailStripesArmRight = Stripes (Right)
+marking-GastropoidStripesArmRight-stripes_arm_right = Stripes (Right)
+marking-GastropoidStripesArmRight = Stripes (Right)

Resources/Locale/en-US/_Impstation/markings/misc.ftl

@@ -197,25 +197,25 @@ marking-FadingStars-fadingstars1 = Brightest
 marking-FadingStars-fadingstars2 = Middling
 marking-FadingStars-fadingstars3 = Darkest
 
-# snails
-marking-SnailCheeks = Cheeks
-marking-SnailCheeks-snailcheeks = Cheeks
-marking-SnailShellProstheticSimple = Simple Prosthetic Shell
-marking-SnailShellProstheticSimple-snailshellprostheticsimple = Simple Prosthetic Shell
-marking-SnailShellProsthetic = Prosthetic Shell
-marking-SnailShellProsthetic-snailshellprosthetic = Prosthetic Shell
+# Gastropoids
+marking-GastropoidCheeks = Cheeks
+marking-GastropoidCheeks-snailcheeks = Cheeks
+marking-GastropoidShellProstheticSimple = Simple Prosthetic Shell
+marking-GastropoidShellProstheticSimple-snailshellprostheticsimple = Simple Prosthetic Shell
+marking-GastropoidShellProsthetic = Prosthetic Shell
+marking-GastropoidShellProsthetic-snailshellprosthetic = Prosthetic Shell
 marking-SimpleBow = Cute Bow
 marking-SimpleBow-snailshellprostheticsimplebow = Cute Bow
 marking-SimpleCracks = Small Cracks
 marking-SimpleCracks-snailshellprostheticsimplecracks = Small Cracks
 marking-GlowInTheDarkStars = Glow in the Dark Stars
 marking-GlowInTheDarkStars-snailshellprostheticsimpleglowinthedarkstars = Glow in the Dark Stars
-marking-SnailCheekGlow = Glowing Cheeks
-marking-SnailCheekGlow-snailcheekglow = Glowing Cheeks
+marking-GastropoidCheekGlow = Glowing Cheeks
+marking-GastropoidCheekGlow-Gastropoidcheekglow = Glowing Cheeks
 marking-ProstheticInnerLight = Prosthetic Inner Light
-marking-ProstheticInnerLight-snailshellprostheticinnerlight = Prosthetic Inner Light
+marking-ProstheticInnerLight-Gastropoidshellprostheticinnerlight = Prosthetic Inner Light
 marking-ProstheticPulse = Prosthetic Pulse
-marking-ProstheticPulse-snailshellprostheticpulse = Prosthetic Pulse
+marking-ProstheticPulse-Gastropoidshellprostheticpulse = Prosthetic Pulse
 
 # thaven
 marking-Gills = Gills

Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml

@@ -14,28 +14,28 @@
 #  shaded: unshaded //use for markings that ignore shader
 
 - type: marking
-  id: SnailCheeks
+  id: GastropoidCheeks
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailcheeks
 
 - type: marking
-  id: SnailShellProstheticSimple
+  id: GastropoidShellProstheticSimple
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailshellprostheticsimple
 
 - type: marking
-  id: SnailShellProsthetic
+  id: GastropoidShellProsthetic
   bodyPart: Tail
   markingCategory: Tail
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailshellprosthetic
@@ -44,7 +44,7 @@
   id: SimpleBow
   bodyPart: Tail
   markingCategory: Overlay
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailshellprostheticsimplebow
@@ -53,7 +53,7 @@
   id: SimpleCracks
   bodyPart: Tail
   markingCategory: Overlay
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailshellprostheticsimplecracks
@@ -62,17 +62,17 @@
   id: GlowInTheDarkStars
   bodyPart: Tail
   markingCategory: Overlay
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snailshellprostheticsimpleglowinthedarkstars
   shader: unshaded
 
 - type: marking
-  id: SnailCheekGlow
+  id: GastropoidCheekGlow
   bodyPart: Head
   markingCategory: Head
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: snailcheekglow
@@ -82,7 +82,7 @@
   id: ProstheticInnerLight
   bodyPart: Tail
   markingCategory: Overlay
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: snailshellprostheticinnerlight
@@ -92,7 +92,7 @@
   id: ProstheticPulse
   bodyPart: Tail
   markingCategory: Overlay
-  speciesRestriction: [ Snail ]
+  speciesRestriction: [ Gastropoid ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: snailshellprostheticpulse