diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 7118271c0929..3e82ace0d595 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -253,6 +253,9 @@ - id: ToolboxGoldFilled prob: 0.001 orGroup: Swag + - id: ClothingEyesGlassesGarMecha + prob: 0.01 + orGroup: Swag - id: ClothingEyesGlassesGar prob: 0.01 orGroup: Swag diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 16921d4ce927..ddc5eb21eb9e 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -12,7 +12,7 @@ attackRate: 1.5 damage: types: - Blunt: 7 + Blunt: 10 - type: entity parent: ClothingEyesBase @@ -52,6 +52,25 @@ 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] id: ClothingEyesGlassesMeson diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 60e37bf491c6..c809c6621987 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -153,6 +153,15 @@ - 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index e641ec7fe842..8f91622e9adf 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -17,6 +17,7 @@ - id: ClothingEyesGlassesGar - id: ClothingEyesGlassesGarOrange - id: ClothingEyesGlassesGarGiga + - id: ClothingEyesGlassesGarMecha - id: Wristwatch weight: 0.5 - id: ClothingHeadHatCake @@ -349,6 +350,7 @@ prototypes: - Lighter - CigCartonBlue + - ClothingEyesGlassesGarMecha - ClothingEyesGlassesGarGiga - ClothingEyesGlassesGarOrange - ClothingEyesGlassesGar diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 1240fa3d8fe6..af05ce305be1 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -208,6 +208,8 @@ orGroup: GiftPool - id: Skub orGroup: GiftPool + - id: ClothingEyesGlassesGarMecha + orGroup: GiftPool - id: ClothingEyesGlassesGarGiga orGroup: GiftPool - id: ClothingEyesGlassesGarOrange diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index 1109e56c2584..f8314bc09d50 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -8,6 +8,17 @@ 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 @@ -45,6 +56,14 @@ equipment: neck: ClothingNeckCloakMiner +- type: loadout + id: DrillerCape + effects: + - !type:GroupLoadoutEffect + proto: DrillerCapeWorthy + equipment: + neck: ClothingNeckCloakDriller + - type: loadout id: SaMantle equipment: diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 6d8463a16114..692598bbc152 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -48,3 +48,36 @@ proto: JensenTimer equipment: eyes: ClothingEyesGlassesJensen + +# Gar glasses from 100h salvage +- 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 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index d5b864057c17..264dc898f4bf 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -45,6 +45,10 @@ - GlassesCheapSunglasses - GlassesJamjar - GlassesJensen + - GlassesGarGreen + - GlassesGarOrange + - GlassesGarRed + - GlassesGarBlack # The usual loadouts of the vox harness that spawn in your chest slot for jobs that don't have outerwear in their loadout - type: loadoutGroup @@ -954,6 +958,7 @@ minLimit: 0 loadouts: - MinerCloak + - DrillerCape - SaMantle - ScarfBrown diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-mecha.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-mecha.png new file mode 100644 index 000000000000..3c09c0141242 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/icon-mecha.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-equipped-EYES.png new file mode 100644 index 000000000000..18a7c1e6c541 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-left.png new file mode 100644 index 000000000000..596f1b1177df Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-right.png new file mode 100644 index 000000000000..e22ea2c60558 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/mecha-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json index 2a1583c00899..a175c989b790 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "icon-alt" }, + { + "name": "icon-mecha" + }, { "name": "icon-super" }, @@ -24,6 +27,10 @@ "name": "alt-equipped-EYES", "directions": 4 }, + { + "name": "mecha-equipped-EYES", + "directions": 4 + }, { "name": "super-equipped-EYES", "directions": 4 @@ -43,6 +50,22 @@ { "name": "alt-inhand-right", "directions": 4 + }, + { + "name": "mecha-inhand-left", + "directions": 4 + }, + { + "name": "mecha-inhand-right", + "directions": 4 + }, + { + "name": "super-inhand-left", + "directions": 4 + }, + { + "name": "super-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png new file mode 100644 index 000000000000..21bd743d0841 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png new file mode 100644 index 000000000000..8d7afcb06871 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/super-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK-vox.png b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK-vox.png new file mode 100644 index 000000000000..633c1a5b5544 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK-vox.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK.png new file mode 100644 index 000000000000..952fa3857df9 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/icon.png new file mode 100644 index 000000000000..f9c4edc516c2 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-left.png new file mode 100644 index 000000000000..33cc08f120fc Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-right.png new file mode 100644 index 000000000000..2ee155845226 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/meta.json new file mode 100644 index 000000000000..1b5d4af49639 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "A prestige cape for salvagers for Impstation by Sha-Seng (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}