Small general fixes for ETO items + Meta files

fixes some small issues regarding ETO items, adds proper suffixes (the guns won't stay ETO branded for long, just until they're ready for station use), small edits to descriptions to make them appear a little better? (i'll need some more proofreading, i'll ask some of the other ETO helpers later) and adds state based copyright for all sprites (alongside making them all 4 rather than 3, not sure what the difference was but purple said i should probably do that somewhere down the line, figured i might as well do it along with the state based copyrights)

Author: errortheone57-cyber

Resources/Locale/en-US/_Starlight/admeme/ETO/eto-multiuse-textfile.ftl

@@ -5,7 +5,7 @@ job-name-eto-combattech = ETO Combat Technician
 job-name-eto-martyr = ETO Martyr
 job-name-eto-demo = ETO Demolition Expert
 
-contraband-examine-text-eto = [color=#c5be14]This item is illegal ETO contraband! [/color]
+contraband-examine-text-eto = [color=#c5be14]This item is illegal ETO contraband![/color]
 
 id-card-access-level-eto = ETO
 

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/etoclothing.yml

@@ -37,7 +37,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitETOOperative
-  name: ETO Operative Jumpsuit
+  name: ETO operative jumpsuit
   description: A jumpsuit built for Freedom Fighters.
   components:
   - type: Sprite
@@ -59,7 +59,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitETOMedical
-  name: ETO Corpsman Jumpsuit
+  name: ETO corpsman jumpsuit
   description: A jumpsuit built for those who keep the freedom fighters alive.
   components:
   - type: Sprite
@@ -70,7 +70,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitETOCombatTech
-  name: ETO Combat Technician Jumpsuit
+  name: ETO combat technician jumpsuit
   description: A jumpsuit built for those who build the foundation of the future.
   components:
   - type: Sprite

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/etogear.yml

@@ -10,7 +10,6 @@
     sprite: _Starlight/Admeme/ETO/etoglasses.rsi
   - type: FlashImmunity
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
   - type: EyeProtection
     protectionTime: 5
 
@@ -59,7 +58,6 @@
   - type: Clothing
     sprite: _Starlight/Admeme/ETO/clothing/etomask.rsi
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
   - type: ShowHealthBars
     damageContainers:
       - Biological
@@ -115,7 +113,7 @@
   parent: [ ClothingMaskGas, BaseETOContraband ]
   id: ClothingMaskGasETOCorpsman
   name: ETO corpsman gas mask
-  description: A Mask fit for the corpsman, modified with a MedHud to show a holographic heads up of the health of your fellow team members.
+  description: A mask fit for the corpsman, modified with a MedHud to show a holographic heads up of the health of your fellow team members.
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/clothing/etomaskcorpsman.rsi
@@ -192,49 +190,11 @@
       maxIntensity: 75
 
 - type: entity
-  parent: [BaseHardBomb, BaseETOContraband]
+  parent: ETOBomb
   id: ETOBetterBomb
   name: PS-21ETO "Planet Buster"
-  description: A bomb of mass destruction, capable of ripping apart even the most fortified structures."Death to my enemy, Freedom to their slaves."
+  description: A bomb of mass destruction, capable of ripping apart even the most fortified structures."Death to my enemy, freedom to their slaves."
   components:
-    - type: Sprite
-      sprite: _Starlight/Admeme/ETO/etobomb.rsi
-      layers:
-        - state: ETO-bomb
-        - state: ETO-bomb-active
-          visible: false
-          map: [ "primed" ]
-        - state: ETO-bomb-wires
-          visible: false
-          map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
-    - type: GenericVisualizer
-      visuals:
-        enum.DefusableVisuals.Active:
-          primed:
-            True: { visible: true }
-            False: { visible: false }
-        enum.WiresVisualLayers.MaintenancePanel:
-          enum.WiresVisualLayers.MaintenancePanel:
-            True: { visible: true }
-            False: { visible: false }
-    - type: Item
-      size: Large
-      shape:
-      - 0,0,4,4
-    - type: Clothing
-      quickEquip: false
-      slots:
-      - back
-      - suitStorage
-    - type: TimerTrigger
-      delay: 300
-      delayOptions: [300, 600, 900]
-      initialBeepDelay: 0
-      beepSound: /Audio/Machines/timer.ogg
-    - type: PointLight
-      color: "#C7001B"
-      radius: 1.1
-      softness: 1
     - type: Explosive
       explosionType: HardBomb
       totalIntensity: 500000.0

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/etopda.yml

@@ -2,7 +2,7 @@
 - type: entity
   parent: [ ParamedicPDA ]
   id: ETOCorpsmanPDA
-  name: ETO Corpsman PDA
+  name: ETO corpsman PDA
   description: Nobody dies on your watch, atleast not your team.
   components:
   - type: Appearance
@@ -25,8 +25,8 @@
 - type: entity
   parent: [ ParamedicPDA ]
   id: ETOTeamLeadPDA
-  name: ETO Team lead PDA
-  description: Lead the Team, fight against the corporate giants. Death to our enemy, freedom to their slaves.
+  name: ETO team lead PDA
+  description: Lead the team, fight against the corporate giants. Death to our enemy, freedom to their slaves.
   components:
   - type: Appearance
     appearanceDataInit:
@@ -48,7 +48,7 @@
 - type: entity
   parent: BasePDA
   id: ETOOperativePDA
-  name: ETO Operative PDA
+  name: ETO operative PDA
   description: Fight for freedom, fight for the people.
   components:
   - type: Appearance
@@ -71,7 +71,7 @@
 - type: entity
   parent: BasePDA
   id: ETOOperativePDACombatTech
-  name: ETO Combat technician PDA
+  name: ETO combat technician PDA
   description: Build the pillars that support our cause, break the chains that hold us back.
   components:
   - type: Appearance
@@ -94,7 +94,7 @@
 - type: entity
   parent: BasePDA
   id: ETOOperativePDAMartyr
-  name: ETO Martyr PDA
+  name: ETO martyr PDA
   description: Remember who you fight for, remember who you are.
   components:
   - type: Appearance
@@ -117,8 +117,8 @@
 - type: entity
   parent: BasePDA
   id: ETOOperativePDADemo
-  name: ETO Demolitionist PDA
-  description: Blow apart their walls, Free those oppressed by your enemies.
+  name: ETO demolitionist PDA
+  description: Blow apart their walls, free those oppressed by your enemies.
   components:
   - type: Appearance
     appearanceDataInit:

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/etoprotectiveclothing.yml

@@ -4,7 +4,7 @@
   parent: [BaseETOContraband, ClothingOuterArmorBase, ClothingOuterStorageBase]
   id: ClothingOuterVestWebETOBase
   name: ETO web vest
-  description: A protective vest built for ETO Members, allows you to stay light on your feet.
+  description: A protective vest built for ETO members, allowing you to stay light on your feet.
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/clothing/armour/etovest.rsi
@@ -27,7 +27,7 @@
   parent: ClothingOuterVestWebETOBase
   id: ClothingOuterVestWebETOCorpsman
   name: ETO medical vest
-  description: A protective vest built for ETO Corpsmen, allows you to stay light on your feet and get to those in need.
+  description: A protective vest built for ETO corpsmen, allowing you to stay light on your feet and get to those in need.
   components:
     - type: Sprite
       sprite: _Starlight/Admeme/ETO/clothing/armour/etomedicvest.rsi
@@ -50,7 +50,7 @@
   parent: ClothingOuterVestWebETOBase
   id: ClothingOuterVestWebETOLead
   name: ETO lead web vest
-  description: A highly protective Web Vest designed for the Team Leader, Death to our enemy, freedom to their slaves.
+  description: A highly protective Web Vest designed for the team leader.
   components:
     - type: Sprite
       sprite: _Starlight/Admeme/ETO/clothing/armour/etoleadvest.rsi
@@ -73,7 +73,7 @@
   parent: ClothingOuterVestWebETOBase
   id: ClothingOuterVestWebETOCombatTech
   name: ETO combat technician vest
-  description: A sturdy vest ripped off of an advanced Engineers hardsuit, protects the body but weighs down the user.
+  description: A sturdy vest ripped off of an advanced engineers hardsuit. Protects the body but weighs down the user.
   components:
     - type: Sprite
       sprite: _Starlight/Admeme/ETO/clothing/armour/etoctvest.rsi
@@ -99,7 +99,7 @@
   parent: [ClothingHeadHelmetBase, BaseETOContraband]
   id: ClothingHeadHelmetETO
   name: ETO operative helmet
-  description: A helmet designed for ETO Operatives, providing good skull protection and a good way to tell who your pals are.
+  description: A helmet designed for ETO operatives, provides basic protection.
   components:
   - type: Armor
     modifiers:
@@ -117,7 +117,7 @@
   parent: [ClothingHeadBase, BaseETOContraband]
   id: ClothingHeadETOEvaHelmet
   name: ETO space hazard helmet
-  description: A space certified helmet designed to work with most space certified softsuits, has some added ballistic protection to keep you alive.
+  description: A space certified helmet with added ballistic protection.
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/clothing/armour/etoevahelmet.rsi
@@ -159,7 +159,7 @@
   parent: [ BaseETOContraband, ClothingOuterEVASuitBase ]
   id: ClothingOuterSoftsuitETO
   name: ETO space hazard suit
-  description: A Lightweight EVA Suit padded with ballistic protection, slows you down but keeps you alive.
+  description: A Lightweight EVA Suit padded with ballistic protection.
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/clothing/armour/etoevasuit.rsi

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/etoweapons.yml

@@ -2,7 +2,9 @@
   name: PS Z46
   parent: [BaseSecurityContraband, BaseWeaponRifle]
   id: WeaponRifleZ46
-  description: A Private Servitude designed rifle that was built to compete with the arms race, chambers in .30 rifle rounds and hits like a car.
+  suffix: ETO
+  categories: [ DoNotMap ]
+  description: A rifle designed by Private Servitude to make heavier rifles more commonly available. Chambers in .30 rifle rounds.
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/weapons/g36/g36.rsi
@@ -67,7 +69,9 @@
   name: PS Z77 T1
   parent: [BaseWeaponRifle, BaseSecurityContraband]
   id: WeaponRifleZ77T1
-  description: A battle rifle designed by Private Servitude, takes .20 rifle rounds.
+  description: A rifle designed by Private Servitude, cheaper than the commonly used Lecter. Takes .20 rifle rounds.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/weapons/m77b1/m77.rsi
@@ -130,7 +134,9 @@
   name: PS DD-22 Dryson
   parent: [BaseWeaponSubMachineGun, BaseSecuritySalvageContraband]
   id: WeaponSubMachineGunDD22
-  description: Designed by Private Servitude, while it shares some similarities with the AKMS, it was made by an entirely different company. Chambers in .35 Rounds and feeds from a unique bottom mounted magazine.
+  description: An SMG designed by Private Servitude, partially inspired by the AKMS. Chambers in .35 Rounds and feeds from a unique bottom mounted magazine.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/weapons/bizon.rsi
@@ -185,7 +191,9 @@
   name: PS Taiga-10
   parent: [BaseWeaponShotgunAny, BaseGunWieldable, BaseSecurityContraband]
   id: WeaponShotgunTaiga
-  description: A shotgun designed by Private Servitude, chambered in 12 gauge and feeds from 12 Gauge drum magazines. Can switch between semi-auto and full auto.
+  description: A shotgun designed by Private Servitude, feeds from 12 Gauge drum magazines. Can switch between semi-auto and full auto.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Item
     sprite: _Starlight/Admeme/ETO/weapons/saiga/saigainhand.rsi
@@ -234,7 +242,9 @@
   name: PS-75 Auto
   parent: [BaseWeaponPistol, BaseSecurityContraband]
   id: WeaponPistol75auto
-  description: A handgun with an ergonomic design, feeds from .35 pistol magazines and can fire in full-auto if the time calls for it.
+  description: A fully automatic handgun with an ergonomic design, feeds from .35 pistol magazines.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/weapons/cz75.rsi

Resources/Prototypes/_Starlight/Admeme/ETO/ETOAssets/hypospray.yml

@@ -2,7 +2,9 @@
   parent: [ AdvancedJetInjector, BaseETOContraband ]
   id: ETOMartyrInjector
   name: combat stimulant injector
-  description: A modified jet injector that allows for fast injections of combat stims, not exactly perfect but allows for the Martyr to excell in what they do best, being a crackhead.
+  description: A modified jet injector that can synthesize its own combat mix. Takes 40 seconds to fully refill itself.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _Starlight/Admeme/ETO/crackheadjetinjector.rsi
@@ -37,8 +39,10 @@
 - type: entity
   parent: [ChemicalMedipen, BaseETOContraband]
   id: CombatMedipenETO
-  name: dilluted combat medipen
-  description: A weaker, less effective version of the standard combat medipen, still fixes most forms of damage but some of the solution only works below 50 total damage.
+  name: diluted combat medipen
+  description: A weaker, less effective version of the standard combat medipen.
+  suffix: ETO
+  categories: [ DoNotMap ]
   components:
   - type: Item
     inhandVisuals:

Resources/Textures/_Starlight/Admeme/ETO/clothing/armour/etoctvest.rsi/meta.json

@@ -1,30 +1,35 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made The Purple Screen",
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Made by The Purple Screen",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "icon"
+      "name": "icon",
+      "copyright": "The Purple Screen"
     },
     {
       "name": "equipped-OUTERCLOTHING",
-      "directions": 4
+      "directions": 4,
+      "copyright": "The Purple Screen"
     },
     {
       "name": "equipped-OUTERCLOTHING-vox",
-      "directions": 4
+      "directions": 4,
+      "copyright": "The Purple Screen"
     },
     {
       "name": "inhand-left",
-      "directions": 4
+      "directions": 4,
+      "copyright": "The Purple Screen"
     },
     {
       "name": "inhand-right",
-      "directions": 4
+      "directions": 4,
+      "copyright": "The Purple Screen"
     }
   ]
 }