Merge pull request impstation#1679 from hivehum/wasses

colorful glasses

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -52,25 +52,6 @@
       types:
         Blunt: 10
 
-- type: entity
-  parent: ClothingEyesBase
-  id: ClothingEyesGlassesGarMecha
-  name: mecha gar glasses
-  description: Believe in me! Believe in the me who believes in you!
-  components:
-  - type: Sprite
-    sprite: Clothing/Eyes/Glasses/gar.rsi
-    state: icon-mecha
-  - type: Clothing
-    sprite: Clothing/Eyes/Glasses/gar.rsi
-    equippedPrefix: mecha
-  - type: Item
-    heldPrefix: mecha
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 10
-
 - type: entity
   parent: [ClothingEyesBase, BaseLensSlot, BaseEngineeringContraband] # BaseLensSlot from imp
   id: ClothingEyesGlassesMeson

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -135,15 +135,6 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/miner.rsi
 
-- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckCloakDriller
-  name: driller's cape
-  description: Worn by the bravest salvagers, whose diamond-tipped drills can pierce the very heavens.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Cloaks/driller.rsi
-
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakTrans

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -17,7 +17,7 @@
         - id: ClothingEyesGlassesGar
         - id: ClothingEyesGlassesGarOrange
         - id: ClothingEyesGlassesGarGiga
-        - id: ClothingEyesGlassesGarMecha
+        - id: ClothingEyesGlassesGarMecha # imp
       - id: Wristwatch
         weight: 0.5
       - id: ClothingHeadHatCake

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -210,7 +210,7 @@
         orGroup: GiftPool
       - id: Skub
         orGroup: GiftPool
-      - id: ClothingEyesGlassesGarMecha
+      - id: ClothingEyesGlassesGarMecha # imp
         orGroup: GiftPool
       - id: ClothingEyesGlassesGarGiga
         orGroup: GiftPool

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -8,17 +8,6 @@
       role: JobSalvageSpecialist
       time: 187200 #52 hrs (1 hour per week for 1 year)
 
-# Extreme time requirement prestige cape due to how flashy it is
-# They already have a way to show off playing for 52 hours anyway
-- type: loadoutEffectGroup
-  id: DrillerCapeWorthy
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobSalvageSpecialist
-      time: 360000 #100 hrs
-
 # Back
 - type: loadout
   id: SalvageSpecialistBackpack
@@ -35,39 +24,6 @@
   equipment:
     back: ClothingBackpackDuffelSalvage
 
-# Eyes
-- type: loadout
-  id: GlassesGarGreen
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: DrillerCapeWorthy
-  equipment:
-    eyes: ClothingEyesGlassesGar
-
-- type: loadout
-  id: GlassesGarOrange
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: DrillerCapeWorthy
-  equipment:
-    eyes: ClothingEyesGlassesGarOrange
-
-- type: loadout
-  id: GlassesGarRed
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: DrillerCapeWorthy
-  equipment:
-    eyes: ClothingEyesGlassesGarGiga
-
-- type: loadout
-  id: GlassesGarBlack
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: DrillerCapeWorthy
-  equipment:
-    eyes: ClothingEyesGlassesGarMecha
-
 
 # OuterClothing
 - type: loadout
@@ -90,14 +46,6 @@
   equipment:
     neck: ClothingNeckCloakMiner
 
-- type: loadout
-  id: DrillerCape
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: DrillerCapeWorthy
-  equipment:
-    neck: ClothingNeckCloakDriller
-
 - type: loadout
   id: SaMantle
   equipment:

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -78,6 +78,14 @@
   loadouts:
   - Glasses
   - GlassesCheapSunglasses
+  # imp edit start - its in the middle for alphabetizing reasons sorry
+  - GlassesColorfulPink
+  - GlassesColorfulRed
+  - GlassesColorfulBlue
+  - GlassesColorfulGreen
+  - GlassesColorfulPurple
+  - GlassesColorfulYellow
+  # imp edit end
   - GlassesJamjar
   - GlassesJensen
 
@@ -955,7 +963,7 @@
   minLimit: 0
   loadouts:
   - MinerCloak
-  - DrillerCape
+  - DrillerCape # imp
   - SaMantle
   - ScarfBrown
 
@@ -974,12 +982,20 @@
   loadouts:
   - Glasses
   - GlassesCheapSunglasses
-  - GlassesJamjar
-  - GlassesJensen
+  # imp edit start - in the middle for alphabetizing purposes
+  - GlassesColorfulBlue
+  - GlassesColorfulGreen
+  - GlassesColorfulPink
+  - GlassesColorfulPurple
+  - GlassesColorfulRed
+  - GlassesColorfulYellow
+  - GlassesGarBlack
   - GlassesGarGreen
   - GlassesGarOrange
   - GlassesGarRed
-  - GlassesGarBlack
+  # imp edit end
+  - GlassesJamjar
+  - GlassesJensen
 
 - type: loadoutGroup
   id: SalvageSpecialistOuterClothing

Resources/Prototypes/_Impstation/Entities/Clothing/Eyes/glasses.yml

@@ -17,3 +17,102 @@
   - type: IdentityBlocker
     coverage: EYES
   - type: ShowJobIcons
+
+- type: entity
+  parent: [ ClothingEyesBase, BaseLensSlot ]
+  id: ClothingEyesGlassesColorfulBase
+  name: colorful glasses
+  abstract: true
+  description: Colorful glasses for your face.
+  components:
+    - type: Sprite
+      sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/pink.rsi
+    - type: Clothing
+      sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/pink.rsi
+      slots:
+      - HEAD
+      - EYES
+    - type: Tag
+      tags:
+      - WhitelistChameleon
+      - DroneUsable
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulPink
+  name: colorful pink glasses
+  description: You look lovely!
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulRed
+  name: colorful red glasses
+  description: They're no rose tinted glasses.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/red.rsi
+  - type: Clothing
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/red.rsi
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulBlue
+  name: colorful blue glasses
+  description: No need to feel blue.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/blue.rsi
+  - type: Clothing
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/blue.rsi
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulGreen
+  name: colorful green glasses
+  description: Green with envy.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/green.rsi
+  - type: Clothing
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/green.rsi
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulPurple
+  name: colorful purple glasses
+  description: Scientifically accurate!
+  components:
+  - type: Sprite
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/purple.rsi
+  - type: Clothing
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/purple.rsi
+
+- type: entity
+  parent: ClothingEyesGlassesColorfulBase
+  id: ClothingEyesGlassesColorfulYellow
+  name: colorful yellow glasses
+  description: Now that's cash money!
+  components:
+  - type: Sprite
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/yellow.rsi
+  - type: Clothing
+    sprite: _Impstation/Clothing/Eyes/Glasses/colorfulglasses/yellow.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesGarMecha
+  name: mecha gar glasses
+  description: Believe in me! Believe in the me who believes in you!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-mecha
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    equippedPrefix: mecha
+  - type: Item
+    heldPrefix: mecha
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10

Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml

@@ -79,3 +79,11 @@
   - type: Sprite
     sprite: _Impstation/Clothing/Neck/Cloaks/cmogreatcloak.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakDriller
+  name: driller's cape
+  description: Worn by the bravest salvagers, whose diamond-tipped drills can pierce the very heavens.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/driller.rsi

Resources/Prototypes/_Impstation/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -1,3 +1,14 @@
+# Extreme time requirement prestige cape due to how flashy it is
+# They already have a way to show off playing for 52 hours anyway
+- type: loadoutEffectGroup
+  id: DrillerCapeWorthy
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 360000 #100 hrs
+
 # Jumpsuit
 - type: loadout
   id: SalvageSpecialistJumpsuit
@@ -7,4 +18,47 @@
 - type: loadout
   id: SalvageSpecialistJumpskirt
   equipment:
-    jumpsuit: ClothingUniformJumpskirtSalvageSpecialist
+    jumpsuit: ClothingUniformJumpskirtSalvageSpecialist
+
+# Mantle
+
+- type: loadout
+  id: DrillerCape
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    neck: ClothingNeckCloakDriller
+
+# Eyes
+- type: loadout
+  id: GlassesGarGreen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGar
+
+- type: loadout
+  id: GlassesGarOrange
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarOrange
+
+- type: loadout
+  id: GlassesGarRed
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarGiga
+
+- type: loadout
+  id: GlassesGarBlack
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarMecha