Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…

…ngines into wizmerge
Simple-Station · Dec 21, 2024 · f32080b · f32080b
2 parents 490ab08 + cc1e52c
commit f32080b
Show file tree

Hide file tree

Showing 75 changed files with 1,529 additions and 2,745 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8713,3 +8713,32 @@ Entries:
   id: 6583
   time: '2024-12-18T01:32:32.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1357
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: Fixed the Saltern bridge being a hard vacuum at roundstart.
+  id: 6584
+  time: '2024-12-19T22:52:32.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1359
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added labels to all generic colorable items in loadouts, so that players
+        can see which items have custom colors as customization options.
+    - type: Remove
+      message: >-
+        Removed all 'specific color' variants of colorable items from Loadouts,
+        such as "Blue Jumpsuit" when a colorable jumpsuit exists. 
+  id: 6585
+  time: '2024-12-21T18:02:28.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1364
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added colorable variants of fingerless gloves, headbands, berets,
+        hairflowers, cloth masks, and the neck gaiter.
+  id: 6586
+  time: '2024-12-21T19:25:13.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1365
diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl
@@ -23,3 +23,4 @@ fibers-white = white
 fibers-yellow = yellow
 fibers-regal-blue = regal blue
 fibers-olive = olive
+fibers-dyed = dyed fibers
diff --git a/Resources/Locale/en-US/loadouts/generic/back.ftl b/Resources/Locale/en-US/loadouts/generic/back.ftl
@@ -0,0 +1,3 @@
+loadout-name-LoadoutBackpack = grey backpack (colorable)
+loadout-name-LoadoutBackpackDuffel = grey duffelbag (colorable)
+loadout-name-LoadoutBackpackSatchel = grey satchel (colorable)
diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl → ...es/Locale/en-US/loadouts/generic/eyes.ftl b/Resources/Locale/en-US/loadouts/eyes.ftl → ...es/Locale/en-US/loadouts/generic/eyes.ftl
@@ -3,3 +3,5 @@ loadout-description-LoadoutEyesBlindfold = Why would you want this?
 
 loadout-name-LoadoutItemBlindfoldFake = "blind"fold
 loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised.
+
+loadout-name-LoadoutEyesGlasses = glasses (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl
@@ -0,0 +1,2 @@
+loadout-name-LoadoutHandsColorWhite = gloves (colorable)
+loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl
@@ -0,0 +1,15 @@
+loadout-description-LoadoutHeadBeaverHat = Gentlemen.
+loadout-description-LoadoutHeadTophat = A stylish black tophat.
+
+loadout-name-LoadoutHeadFedoraWhite = fedora (colorable)
+loadout-name-LoadoutHeadHatCowboyWhite = cowboy hat (colorable)
+loadout-name-LoadoutHeadHatMimesoft = baseball cap (colorable)
+loadout-name-LoadoutHeadHatMimesoftFlipped = baseball cap (colorable, flipped)
+loadout-name-LoadoutHeadHijabColorable = hijab (colorable)
+loadout-name-LoadoutHeadTurbanColorable = turban (colorable)
+loadout-name-LoadoutHeadKippahColorable = kippah (colorable)
+loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable)
+loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable)
+loadout-name-LoadoutHeadBandWhite = headband (colorable)
+loadout-name-LoadoutHeadBeretWhite = beret (colorable)
+loadout-name-LoadoutHeadPoppyWhite = hair flower (colorable)
diff --git a/Resources/Locale/en-US/loadouts/items.ftl → ...s/Locale/en-US/loadouts/generic/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl → ...s/Locale/en-US/loadouts/generic/items.ftl
@@ -35,3 +35,10 @@ loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security)
 loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman)
 loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical)
 loadout-name-LoadoutItemBoxHug = box of hugs (clown)
+
+loadout-name-LoadoutItemLighter = lighter (colorable)
+loadout-name-LoadoutItemLighterCheap = cheap lighter (colorable)
+loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable)
+loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable)
+loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable)
+loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/mask.ftl b/Resources/Locale/en-US/loadouts/generic/mask.ftl
@@ -0,0 +1,3 @@
+loadout-name-LoadoutMaskBandWhite = cloth mask (colorable)
+loadout-name-LoadoutMaskNeckGaiterWhite = neck gaiter (colorable)
+loadout-name-LoadoutMaskSterile = sterile mask (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/neck.ftl b/Resources/Locale/en-US/loadouts/generic/neck.ftl
@@ -0,0 +1,4 @@
+loadout-name-LoadoutNeckOldMantle = old mantle (colorable)
+loadout-name-LoadoutNeckUnathiMantle = unathi mantle (colorable)
+loadout-name-LoadoutNeckTieWhite = suit tie (colorable)
+loadout-name-LoadoutNeckBedsheetWhite = bedsheet (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl
@@ -0,0 +1,11 @@
+loadout-description-LoadoutOuterGhostSheet = Spooky...
+loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket.
+loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie.
+loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie.
+loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug.
+
+loadout-name-LoadoutOuterCoatHoodieGrey = grey hoodie (colorable)
+loadout-name-LoadoutOuterCoatWinterCoat = winter coat (colorable)
+loadout-name-LoadoutOuterCoatHyenhSweater = sweater (colorable)
+loadout-name-LoadoutOuterWinterCoatLong = long winter coat (colorable)
+loadout-name-LoadoutOuterCoatMNKWhiteHoodie = MNK hoodie (colorable)
diff --git a/Resources/Locale/en-US/loadouts/shoes.ftl → ...s/Locale/en-US/loadouts/generic/shoes.ftl b/Resources/Locale/en-US/loadouts/shoes.ftl → ...s/Locale/en-US/loadouts/generic/shoes.ftl
@@ -8,3 +8,9 @@ loadout-description-LoadoutShoesRed = Embrace the spirit of exploration with the
 loadout-description-LoadoutShoesWhite = Elevate your style with these pristine white shoes, a symbol of innovation and progress.
 loadout-description-LoadoutShoesYellow = Light up the space station with these radiant yellow shoes, bringing a burst of energy to your every step.
 loadout-description-LoadoutShoesSlippersDuck = Quack up your downtime with these adorable duck slippers that waddle the line between comfort and quirkiness.
+
+loadout-name-LoadoutShoesWhite = shoes (colorable)
+loadout-name-LoadoutShoesBootsCowboyWhite = cowboy boots (colorable)
+loadout-name-LoadoutShoesBootsCowboyFancy = fancy cowboy boots (colorable)
+loadout-name-LoadoutShoesMiscWhite = misc shoes (colorable)
+loadout-name-LoadoutShoesClothWrap = cloth foot wraps (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/uniform.ftl b/Resources/Locale/en-US/loadouts/generic/uniform.ftl
@@ -0,0 +1,12 @@
+loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide.
+
+loadout-name-LoadoutUniformJumpsuitColorWhite = jumpsuit (colorable)
+loadout-name-LoadoutUniformJumpskirtColorWhite = jumpskirt (colorable)
+loadout-name-LoadoutUniformMartialGi = gi (colorable)
+loadout-name-LoadoutClothingJumpsuitKimono = kimono (colorable)
+loadout-name-LoadoutClothingMNKOfficeSkirt = MNK office skirt (colorable)
+loadout-name-LoadoutClothingMNKUnderGarment = MNK under garment (colorable)
+loadout-name-LoadoutClothingMNKGymBra = MNK gym bra (colorable)
+loadout-name-LoadoutClothingJumpsuitSuitWhite = business suit (colorable)
+loadout-name-LoadoutClothingJumpsuitSuitWhiteAlt = business suit (alt, colorable)
+loadout-name-LoadoutClothingJumpsuitSuitWhiteMob = mob suit (colorable)
diff --git a/Resources/Locale/en-US/loadouts/head.ftl b/Resources/Locale/en-US/loadouts/head.ftl
diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl
@@ -0,0 +1 @@
+loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable)
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl
@@ -10,3 +10,6 @@ loadout-description-LoadoutCommandCapHatCapcap = The Captain's cap, pretty nice.
 loadout-description-LoadoutCommandCapHatBeret = The Captain's beret, very nice.
 loadout-description-LoadoutCommandCapMaskGas = Why would the captain need this? I don't know, but it looks cool.
 loadout-description-LoadoutCommandCapItemDrinkFlask = The finest of flasks, for the finest of drinks.
+
+loadout-name-LoadoutCaptainDrinkFlask = captain's drink flask (colorable)
+loadout-name-LoadoutCaptainGlovesInspection = inspection gloves (colorable)
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl
@@ -2,3 +2,5 @@ loadout-description-LoadoutCommandHOPNeckMantle = To show who has the authority
 loadout-description-LoadoutCommandHOPNeckCloak = To really show who has the authority around here.
 loadout-description-LoadoutCommandHOPBackIan = A backpack that looks like Ian, how cute!
 loadout-description-LoadoutCommandHOPHatCap = The HOP's cap, pretty nice.
+
+loadout-name-LoadoutHeadOfPersonnelGlovesInspection = inspection gloves (colorable)
diff --git a/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl
@@ -0,0 +1,14 @@
+loadout-name-LoadoutSalvageBackpackBackpack = salvage backpack (colorable)
+loadout-name-LoadoutSalvageBackpackSatchel = salvage satchel (colorable)
+loadout-name-LoadoutSalvageBackpackDuffel = salvage duffelbag (colorable)
+loadout-name-LoadoutSalvageBeltMilitaryWebbing = military webbing (colorable)
+loadout-name-LoadoutSalvageWeaponsCombatKnife = combat knife (colorable)
+loadout-name-LoadoutSalvageWeaponsKitchenKnife = kitchen knife (colorable)
+loadout-name-LoadoutSalvageWeaponsSurvivalKnife = survival knife (colorable)
+loadout-name-LoadoutSalvageWeaponsKukriKnife = kukri (colorable)
+loadout-name-LoadoutSalvageWeaponsCleaver = cleaver (colorable)
+loadout-name-LoadoutSalvageWeaponsThrowingKnife = throwing knives (x3, colorable)
+loadout-name-LoadoutSalvageWeaponsMachete = machete (colorable)
+loadout-name-LoadoutSalvageWeaponsCutlass = cutlass (colorable)
+loadout-name-LoadoutSalvageWeaponsKatana = katana (colorable)
+loadout-name-LoadoutSalvageWeaponsWakizashi = wakizashi (colorable)
diff --git a/Resources/Locale/en-US/loadouts/neck.ftl b/Resources/Locale/en-US/loadouts/neck.ftl
diff --git a/Resources/Locale/en-US/loadouts/outerClothing.ftl b/Resources/Locale/en-US/loadouts/outerClothing.ftl
diff --git a/Resources/Locale/en-US/loadouts/uniform.ftl b/Resources/Locale/en-US/loadouts/uniform.ftl
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,5 @@ loadout-description-LoadoutEyesBlindfold = Why would you want this?

		loadout-name-LoadoutItemBlindfoldFake = "blind"fold
		loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised.

		loadout-name-LoadoutEyesGlasses = glasses (colorable)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		loadout-name-LoadoutHandsColorWhite = gloves (colorable)
		loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable)