diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 828a53b0aa2..3d3a93f5f64 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -188,7 +188,11 @@ - type: Sprite layers: - state: default - - state: idpassenger + - state: department + color: "#878787" + - state: subdepartment + color: "#878787" + - state: passenger - type: PresetIdCard job: Passenger @@ -202,7 +206,11 @@ - type: Sprite layers: - state: default - - state: idintern-tech + - state: department + color: "#F39F27" + - state: subdepartment + color: "#F39F27" + - state: assistant - type: entity parent: PassengerIDCard @@ -214,7 +222,11 @@ - type: Sprite layers: - state: default - - state: idintern-med + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: assistant - type: entity parent: PassengerIDCard @@ -226,7 +238,11 @@ - type: Sprite layers: - state: default - - state: idintern-sci + - state: department + color: "#C96DBF" + - state: subdepartment + color: "#C96DBF" + - state: assistant - type: entity parent: PassengerIDCard @@ -238,7 +254,11 @@ - type: Sprite layers: - state: default - - state: idintern-cadet + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: assistant - type: entity parent: PassengerIDCard @@ -250,7 +270,11 @@ - type: Sprite layers: - state: default - - state: idintern-service + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: assistant - type: entity parent: [IDCardStandard, BaseGrandTheftContraband] @@ -260,7 +284,11 @@ - type: Sprite layers: - state: gold - - state: idcaptain + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: captain - type: Item heldPrefix: gold - type: PresetIdCard @@ -282,7 +310,11 @@ - type: Sprite layers: - state: default - - state: idsecurityofficer + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: securityofficer - type: PresetIdCard job: SecurityOfficer @@ -294,7 +326,11 @@ - type: Sprite layers: - state: default - - state: idwarden + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: warden - type: PresetIdCard job: Warden @@ -306,7 +342,11 @@ - type: Sprite layers: - state: default - - state: idstationengineer + - state: department + color: "#F39F27" + - state: subdepartment + color: "#F39F27" + - state: stationengineer - type: PresetIdCard job: StationEngineer @@ -318,7 +358,11 @@ - type: Sprite layers: - state: default - - state: idmedicaldoctor + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: medicaldoctor - type: PresetIdCard job: MedicalDoctor @@ -330,7 +374,11 @@ - type: Sprite layers: - state: default - - state: idparamedic + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: paramedic - type: PresetIdCard job: Paramedic @@ -341,8 +389,12 @@ components: - type: Sprite layers: - - state: chemist # Goobstation - Chemist card - - state: idchemist + - state: default + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: chemist - type: PresetIdCard job: Chemist - type: Item # Goobstation - Chemist card @@ -357,7 +409,11 @@ - type: Sprite layers: - state: default - - state: idcargotechnician + - state: department + color: "#B18644" + - state: subdepartment + color: "#B18644" + - state: cargotechnician - type: PresetIdCard job: CargoTechnician @@ -369,19 +425,27 @@ - type: Sprite layers: - state: default - - state: idshaftminer + - state: department + color: "#B18644" + - state: subdepartment + color: "#C96DBF" + - state: shaftminer - type: PresetIdCard job: SalvageSpecialist - type: entity parent: IDCardStandard id: QuartermasterIDCard - name: quartermaster ID card + name: logistics officer ID card components: - type: Sprite layers: - state: silver - - state: idquartermaster + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#B18644" + - state: cargotechnician - type: Item heldPrefix: silver - type: PresetIdCard @@ -395,7 +459,11 @@ - type: Sprite layers: - state: default - - state: idscientist + - state: department + color: "#C96DBF" + - state: subdepartment + color: "#C96DBF" + - state: scientist - type: PresetIdCard job: Scientist @@ -406,8 +474,12 @@ components: - type: Sprite layers: - - state: default - - state: idclown + - state: rainbow + - state: department + color: "#FF00FF" + - state: subdepartment + color: "#58C800" + - state: clown - type: PresetIdCard job: Clown @@ -419,7 +491,10 @@ - type: Sprite layers: - state: default - - state: idmime + - state: department + color: "#878787" + - state: subdepartment + - state: mime - type: PresetIdCard job: Mime @@ -431,7 +506,11 @@ - type: Sprite layers: - state: default - - state: idchaplain + - state: department + color: "#C96DBF" + - state: subdepartment + color: "#58C800" + - state: chaplain - type: PresetIdCard job: Chaplain @@ -443,7 +522,11 @@ - type: Sprite layers: - state: default - - state: idjanitor + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: janitor - type: PresetIdCard job: Janitor @@ -455,7 +538,11 @@ - type: Sprite layers: - state: default - - state: idbartender + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: bartender - type: PresetIdCard job: Bartender @@ -483,7 +570,11 @@ - type: Sprite layers: - state: default - - state: idcook + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: cook - type: PresetIdCard job: Chef @@ -495,7 +586,11 @@ - type: Sprite layers: - state: default - - state: idbotanist + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: botanist - type: PresetIdCard job: Botanist @@ -507,7 +602,11 @@ - type: Sprite layers: - state: default - - state: idcurator + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: curator - type: PresetIdCard job: Librarian @@ -519,7 +618,11 @@ - type: Sprite layers: - state: default - - state: idlawyer + - state: department + color: "#878787" + - state: subdepartment + color: "#CB0000" + - state: lawyer - type: PresetIdCard job: Lawyer @@ -531,7 +634,11 @@ - type: Sprite layers: - state: silver - - state: idheadofpersonnel + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#58C800" + - state: headofpersonnel - type: Item heldPrefix: silver - type: PresetIdCard @@ -545,7 +652,11 @@ - type: Sprite layers: - state: silver - - state: idchiefengineer + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#F39F27" + - state: stationengineer - type: Item heldPrefix: silver - type: PresetIdCard @@ -559,7 +670,11 @@ - type: Sprite layers: - state: silver - - state: idchiefmedicalofficer + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#5B97BC" + - state: medicaldoctor - type: Item heldPrefix: silver - type: PresetIdCard @@ -573,7 +688,11 @@ - type: Sprite layers: - state: silver - - state: idresearchdirector + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#C96DBF" + - state: scientist - type: Item heldPrefix: silver - type: PresetIdCard @@ -587,7 +706,11 @@ - type: Sprite layers: - state: silver - - state: idheadofsecurity + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#CB0000" + - state: securityofficer - type: Item heldPrefix: silver - type: PresetIdCard @@ -616,7 +739,11 @@ - type: Sprite layers: - state: default - - state: idbrigmedic + - state: department + color: "#CB0000" + - state: subdepartment + color: "#5B97BC" + - state: medicaldoctor - type: PresetIdCard # goob job: Brigmedic @@ -628,7 +755,11 @@ - type: Sprite layers: - state: centcom - - state: idcentcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: Item heldPrefix: blue - type: PresetIdCard @@ -643,8 +774,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_commander + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: captain - type: PresetIdCard job: ERTLeader - type: Item @@ -659,8 +794,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now. + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: chaplain - type: PresetIdCard job: ERTChaplain - type: Item @@ -675,8 +814,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_engineer + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#F39F27" + - state: stationengineer - type: PresetIdCard job: ERTEngineer - type: NanoChatCard # DeltaV @@ -689,8 +832,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_janitor + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#58C800" + - state: janitor - type: PresetIdCard job: ERTJanitor - type: NanoChatCard # DeltaV @@ -703,8 +850,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_medic + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#5B97BC" + - state: medicaldoctor - type: PresetIdCard job: ERTMedical - type: NanoChatCard # DeltaV @@ -717,8 +868,12 @@ components: - type: Sprite layers: - - state: gold - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: PresetIdCard job: ERTSecurity - type: NanoChatCard # DeltaV @@ -729,12 +884,16 @@ id: MusicianIDCard name: musician ID card components: - - type: Sprite - layers: - - state: default - - state: idmusician - - type: PresetIdCard - job: Musician + - type: Sprite + layers: + - state: default + - state: department + color: "#878787" + - state: subdepartment + color: "#878787" + - state: musician + - type: PresetIdCard + job: Musician - type: entity parent: IDCardStandard @@ -744,6 +903,11 @@ - type: Sprite layers: - state: centcom + - state: departmenthead + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: death - type: Item heldPrefix: blue - type: PresetIdCard @@ -769,7 +933,11 @@ - type: Sprite layers: - state: default - - state: idpassenger + - state: department + color: "#878787" + - state: subdepartment + color: "#878787" + - state: passenger - type: AgentIDCard - type: ActivatableUI key: enum.AgentIDCardUiKey.Key @@ -809,8 +977,12 @@ components: - type: Sprite layers: - - state: orange - - state: idatmospherictechnician + - state: default + - state: department + color: "#F39F27" + - state: subdepartment + color: "#F39F27" + - state: atmospherictechnician - type: PresetIdCard job: AtmosphericTechnician @@ -821,7 +993,12 @@ components: - type: Sprite layers: - - state: syndie + - state: black + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: syndicate - type: Access tags: - NuclearOperative @@ -836,7 +1013,12 @@ components: - type: Sprite layers: - - state: pirate + - state: black + - state: department + color: "#878787" + - state: subdepartment + color: "#878787" + - state: death - type: Access tags: - NuclearOperative @@ -852,7 +1034,11 @@ - type: Sprite layers: - state: default - - state: idpsychologist + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: psychologist - type: PresetIdCard job: Psychologist @@ -864,7 +1050,11 @@ - type: Sprite layers: - state: default - - state: idreporter + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: headofpersonnel - type: PresetIdCard job: Reporter @@ -876,7 +1066,11 @@ - type: Sprite layers: - state: default - - state: idboxer + - state: department + color: "#878787" + - state: subdepartment + color: "#878787" + - state: boxer - type: PresetIdCard job: Boxer @@ -888,7 +1082,11 @@ - type: Sprite layers: - state: default - - state: idzookeeper + - state: department + color: "#58C800" + - state: subdepartment + color: "#58C800" + - state: zookeeper - type: PresetIdCard job: Zookeeper @@ -900,7 +1098,11 @@ - type: Sprite layers: - state: default - - state: iddetective + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: detective - type: PresetIdCard job: Detective @@ -947,6 +1149,11 @@ - type: Sprite layers: - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: Item heldPrefix: blue - type: PresetIdCard @@ -962,8 +1169,13 @@ components: - type: Sprite layers: - - state: default - - state: idcluwne + - state: rainbow + - state: department + color: "#5DC574" + - state: subdepartment + color: "#5DC574" + - state: clown + color: "#7C0A0A" - type: IdCard jobTitle: job-title-cluwne jobIcon: JobIconCluwne @@ -979,7 +1191,11 @@ - type: Sprite layers: - state: default - - state: idseniorengineer + - state: department + color: "#F39F27" + - state: subdepartment + color: "#F39F27" + - state: senior - type: entity parent: ResearchIDCard @@ -989,7 +1205,11 @@ - type: Sprite layers: - state: default - - state: idseniorresearcher + - state: department + color: "#C96DBF" + - state: subdepartment + color: "#C96DBF" + - state: senior - type: entity parent: MedicalIDCard @@ -999,7 +1219,11 @@ - type: Sprite layers: - state: default - - state: idseniorphysician + - state: department + color: "#5B97BC" + - state: subdepartment + color: "#5B97BC" + - state: senior - type: entity parent: SecurityIDCard @@ -1009,7 +1233,11 @@ - type: Sprite layers: - state: default - - state: idseniorofficer + - state: department + color: "#CB0000" + - state: subdepartment + color: "#CB0000" + - state: senior - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index 32dc5ac76a0..c5b96fe864e 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -110,7 +110,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/firelock.rsi + sprite: _Maid/Structures/Doors/Airlocks/Standard/firelock.rsi # Maid snapCardinals: true layers: - state: closed diff --git a/Resources/Prototypes/Recipes/Lathes/circuitry.yml b/Resources/Prototypes/Recipes/Lathes/circuitry.yml index 5b273dd852a..3bd1ea02783 100644 --- a/Resources/Prototypes/Recipes/Lathes/circuitry.yml +++ b/Resources/Prototypes/Recipes/Lathes/circuitry.yml @@ -32,7 +32,7 @@ - type: latheRecipe parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ] id: FirelockElectronics - icon: { sprite: Structures/Doors/Airlocks/Standard/firelock.rsi, state: closed } # Goobstation + icon: { sprite: _Maid/Structures/Doors/Airlocks/Standard/firelock.rsi, state: closed } # Goobstation # Maid result: FirelockElectronics - type: latheRecipe diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/identification_cards.yml index 118c5b66fa6..607b5331815 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Misc/identification_cards.yml @@ -63,7 +63,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: IdCard jobTitle: job-name-hecu jobIcon: JobIconNanotrasen @@ -84,7 +89,11 @@ - type: Sprite layers: - state: centcom - - state: idcentcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: Item heldPrefix: - type: PresetIdCard @@ -102,7 +111,11 @@ - type: Sprite layers: - state: centcom - - state: idcentcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: Item heldPrefix: - type: PresetIdCard @@ -120,7 +133,11 @@ - type: Sprite layers: - state: centcom - - state: idcentcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: Item heldPrefix: - type: PresetIdCard @@ -194,7 +211,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: PresetIdCard job: NavyCaptain @@ -208,7 +230,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: PresetIdCard job: NavyOfficer @@ -222,7 +249,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: PresetIdCard job: SpecialOperationsOfficer @@ -236,7 +268,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: PresetIdCard job: Inspector @@ -250,7 +287,12 @@ - type: Sprite sprite: Objects/Misc/id_cards.rsi layers: - - state: ert_security + - state: centcom + - state: departmenthead + color: "#1B67A5" + - state: subdepartment + color: "#1B67A5" + - state: cc - type: IdCard jobTitle: job-name-diplomat jobIcon: JobIconNanotrasen diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png index e0456c6bbf8..34698f72858 100644 Binary files a/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/icon.png b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png index bf6e35edf26..80abde93823 100644 Binary files a/Resources/Textures/Clothing/Belt/emt.rsi/icon.png and b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png index 2cc6ac7af04..460be7e4849 100644 Binary files a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png index 30c2989b07f..7222bcf7b3d 100644 Binary files a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/meta.json b/Resources/Textures/Clothing/Belt/emt.rsi/meta.json index 21a82920656..8f6acfe1245 100644 --- a/Resources/Textures/Clothing/Belt/emt.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/emt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "New sprites drawn by JoeHammad1844, old sprites drawn by Ubaser.", + "copyright": "Drawn by Ubaser.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png index 789a7c00ed2..f7a0c871853 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png index b60662857eb..e22806c85d1 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png index f7f847e9207..8e8542213fa 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png index 804c67c22df..a99658a1936 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json index c8396d7835d..88e3ebd509d 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png index c35961f1e28..914ead60ecc 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png index fd9dc8d5598..2330f3d39ab 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png index 161eacbbcab..21fe32a5c52 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png index 707312ba3c9..98bf0b33b5b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json index 22ef79ab0f4..14008ae27be 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser, recolored by InfinityRedPanda.", + "copyright": "Drawn by Ubaser.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png index 26464eaee71..57dd8882d3c 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png index 89889bd84c9..11237e02a94 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png index a662396eabb..5ec31202f10 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png index f008e616314..f9ea9a377af 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json index c8396d7835d..88e3ebd509d 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png index 3d31bb99507..ee69fc8b33f 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png index 6ad4da839e2..0ea62041f0b 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json index c8396d7835d..88e3ebd509d 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png index fa70a3067e2..2e9de699582 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png index 1c27feec5ae..e158cc68eef 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index 14fffa6d475..f930ae15cf5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide", "size": { "x": 32, "y": 32 @@ -17,17 +17,9 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 44259b170e9..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png index 772670446bc..da83451329b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 0ada8f39e8b..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png index ef32c38de88..176eb22cf2d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png index f73f5a98fc2..be3cd97eb7e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png index 1cb0ad002f8..2e6cd06a076 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json index 14fffa6d475..f930ae15cf5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide", "size": { "x": 32, "y": 32 @@ -17,17 +17,9 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 3527b4e51a3..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png index 80919be0e71..6348ab2c961 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 73f2f848223..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png index d99b5b4cf66..6ef78080694 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png index b79b46ab702..8b5eec131c2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png index 49a78caa43e..c76d801bf7b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json index 14fffa6d475..f930ae15cf5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide", "size": { "x": 32, "y": 32 @@ -17,17 +17,9 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 6db6f8f5726..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png index d534389208d..8ec84341db3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 37c4aa864cb..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png index 5243cd4e1f2..0c9bbec52b9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png index cd99e942df4..32fbcecddd6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png index e3e7b919f96..e6d9f8d51ab 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json index 14fffa6d475..f930ae15cf5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide", "size": { "x": 32, "y": 32 @@ -17,17 +17,9 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index e28b0aba32a..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png index 25b4a0bc064..d6982ce20f3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 8fbf38201ef..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png index 1c060907d52..8f01538a7a6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png index 01c63612c88..8049a11c7c3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png index 7cdce2c2bf7..a3c39c5acc1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json index 14fffa6d475..f930ae15cf5 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide", "size": { "x": 32, "y": 32 @@ -17,17 +17,9 @@ "name": "off-equipped-HELMET", "directions": 4 }, - { - "name": "off-equipped-HELMET-vox", - "directions": 4 - }, { "name": "on-equipped-HELMET", "directions": 4 - }, - { - "name": "on-equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index ff64f4c5aa1..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png index 91dc31d92b8..b6479ec04ef 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 59b9d393dc3..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png index 757c2a4ce12..b521190ff10 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png index 70d2f5adc40..bd3c93afe74 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png index 617f6b45792..86cdb6c0fb4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png deleted file mode 100644 index 1c0e62caf4f..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png deleted file mode 100644 index b88b84d81c2..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json index 9749ec89153..7bd2e3e22a7 100644 --- a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, texture edited by TeaMaki (On github TeaMakiNL), Inhands by onesch", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -13,14 +13,6 @@ { "name": "equipped-HELMET", "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 467822b9251..00000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png index e6810d74524..6028ce3b1a7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png index 0c0dc62be7b..d124fb6d689 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png index 0a75a797db7..1d3cf91b67c 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png index 5c7f8b902b1..c9a0ecf18db 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json index 72965ccfe24..a42fdeb8102 100644 --- a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png deleted file mode 100644 index ab6cf612af6..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png index 8287d479523..38f3e2c4555 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png index 9eaf4e57080..f62f3f84933 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 04f0d87cf2d..920a78a535b 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", "size": { "x": 32, "y": 32 @@ -13,10 +13,6 @@ { "name": "equipped-HELMET", "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png index dabf7033224..29ed862b269 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png index 117ae36c0c0..2b5c2b55526 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json index ecca7c9662b..fde00d61167 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index ec7be08a978..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 78b28400743..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 9e280ba34df..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png index 636a1cb9088..87658bf58d3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png index 8109f04f48a..aa1ed9795b2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png index 612ddf1b54b..d8d511a1064 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png index 489f958b9e9..3c79e71b80d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png index 54bd14c8aac..4d242231b34 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json index 3943b0f3be3..442bfb29202 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -52,14 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 670bf14bf71..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 6bdf4a60d77..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index e4e64f20340..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png index 86c2a978ec2..ab0dc88ef30 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png index 489f958b9e9..6bcdca16c07 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png index 54bd14c8aac..82c918a7822 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 07a6a3df6f2..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 9eac64bf206..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 7d73e554619..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json index 9c6e82d2612..442bfb29202 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Made by WWDP Team, equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -17,34 +17,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, { "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 2dbe5f851c3..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index c448875394c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index bcf14c7791d..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 94be88f44d8..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index da3cfc6d98a..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 15987ac4ba3..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png index cec0cbda47f..98f94fc9a40 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png index 49a486ef944..178aae3e797 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png deleted file mode 100644 index 4e22376f6f0..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png deleted file mode 100644 index 0d30f6df1d9..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json index 1e19b455169..5ed6e84abe6 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand recolored by github:Morb0, reptilian made by murouxlul(705433554602950793), equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,30 +21,6 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, { "name": "open-inhand-left", "directions": 4 @@ -52,14 +28,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 7f39bef93b8..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index e2fad180875..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 70c9b5cf723..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png index 9aeb2c66bc2..31025b7ddad 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png index 2fa58045802..01e8e0fbc11 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index b04f77aa73c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 7bef73993f5..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index ba106d52ae3..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png index 6f4213e888c..06923c3ec92 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png index 242cb40d250..998a03c4a4b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png index 5c87c278b87..b2d5f44f7d9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png index d95cfab8a7f..5785736ec0c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png index 2fbbaa54df7..b2c0d27a363 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json index a4d3ad79420..442bfb29202 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped and icon remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912, reptilian made by murouxlul(705433554602950793), equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -52,14 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 3e40b704619..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index b7be0aae4a0..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 3b6a3cc9467..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png index fe43e4d2be6..e448295da5d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png index d95cfab8a7f..708dea3d7b7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png index 2fbbaa54df7..04f6c36d3f4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 58857a3023a..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index d502ac0ec28..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index ab01da72f14..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png index 270abf067e5..7bddbe3991e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png index c78886effea..ec6f76ee1a0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png index 02ce32c8624..6e5d3530eff 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png index 83d3f527c8c..3a0f37ab9e3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png index 99937faf28e..9392a407a7e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json index ab4e6d947c1..415d267995c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, original base sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,14 +21,6 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -44,22 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 6f6f4b88c2f..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index c9c475719b0..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 7e4a841f36a..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png index f6c705937e4..d2b53c57873 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png index 83d3f527c8c..8f0c1347218 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png index 99937faf28e..3c7f5e1abdb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index ed7902c9370..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index eb19bfad5bd..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png index c61ea628d36..134e2856bdd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png index 36e5d67001a..0a5ccbabcd2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png index 28f96f29515..ea28f8cf3e2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json index b84e6035338..46a5d33e019 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758, resprite by muriexlol, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at pull request https://github.com/space-wizards/space-station-14/pull/10758,", "size": { "x": 32, "y": 32 @@ -36,22 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 6b2e461a589..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 6d650ee57ac..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png index ff2feceec6c..6b669142222 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png index 62df9c6904a..f71113eb24d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png index f331c1788a6..cbd68e913bf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index f15bdd55750..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index da2e1e97017..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png index 09ba6cf8ae9..ed02ccf8024 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png index 0a2543edeec..59b2c93e608 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png index 5ebc12a7922..b3b9ada646c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json index b535dc6699b..dd16b8c78e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758, resprite by DreamlyJack, Fix sprites by DreamlyJack, equipped-OUTERCLOTHING-resomi made by Pofitlo", + "copyright": "Edit by Nairodian (github) of labcoat.rsi from Space-Station-14 at commit https://github.com/space-wizards/space-station-14/pull/10758", "size": { "x": 32, "y": 32 @@ -36,22 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index b96b0684085..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 71169821c7c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png index 62569276f38..bd35aecb083 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png index 0a2543edeec..4683ab9d081 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png index 5ebc12a7922..389d9294228 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index e034b6ba2e4..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 290a4e07c65..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index c53fcf7a902..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png index b4e66f21814..93355862f96 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon-open.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon-open.png index d73d47f9f5f..ddd4a32e1e3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon-open.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon-open.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png index 2ccbba517ec..07ec0ff9a8e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-left.png index 2dde993a3df..a37143bc805 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-right.png index 285c57c33f3..50f452331dd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json index de5252f5fb3..6cb239d8c85 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped and icon remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912, reptilian made by murouxlul(705433554602950793), equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ "name": "open-equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -52,14 +36,6 @@ { "name": "open-inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 0a4f14a5434..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index ed1a57009c7..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index e5d4c25c545..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING.png index 50847043ace..c9820d49e2c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png index 2dde993a3df..0fd1c0d8401 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png index 285c57c33f3..b2596585fae 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 9b42c827a61..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json index 8d3e9b06b88..600bbc3d6db 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/meta.json @@ -1,49 +1,41 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser, sprites for resomi made by Pofitlo", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 1257ef6c950..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png index 3a3f3f85b0d..380a7eb5de4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png index 7be0d597256..c016a74bc35 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rd_coat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index f15bdd55750..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 89369f8794c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json index b8079572aec..442bfb29202 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/meta.json @@ -1,57 +1,41 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprites for resomi made by Pofitlo", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "icon-open" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "open-equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "open-inhand-left", - "directions": 4 - }, - { - "name": "open-inhand-right", - "directions": 4 - } - ] + { + "name": "icon-open" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index b96b0684085..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 973451e5f5b..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png index 5dc3a92fdcd..26764735cc4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png index c28ef522612..5d9906772f0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 2b698c0f4c6..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 9c464f95132..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index d94420af358..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png index 1c0a679e9ec..9c188ab7291 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png index b7f7f307e1f..85e6c096e3e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png index 6e20fcd5ffc..60bc426d8bb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png index 612296ba7c6..8b4abf2e18d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index 7fc636b10b1..4fbd43a08b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162, reptilian made by kuro(388673708753027083). Vox state by Flareguy for Space Station 14, Harpy Variant by Adeinitas, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), reptilian made by kuro(388673708753027083)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index c33e20a6401..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index dbc7d4480ea..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index e4dac6d8ebf..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png index cda3535ed11..eb6d63a7553 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png index e14d077eb4b..432e48be40f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png index d6d36cc7c31..f8f5c1d402c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png index e92fd8d8331..3ff74175cdf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json index ea7823ac053..4fbd43a08b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162, reptilian made by kuro(388673708753027083). Vox sprite by Flareguy for Space Station 14, Harpy Variant By Adeinitas, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), reptilian made by kuro(388673708753027083)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 51b1a8c764c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 000826a3867..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 63e12860630..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png index c4fd38e53e9..6e1f10cfdea 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png index ce1a6809ee2..bd3c592a1ff 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png index deda1dc8cc1..77994efec81 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png index a2281127fa6..f3aeb98d697 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json index ea7823ac053..4fbd43a08b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162, reptilian made by kuro(388673708753027083). Vox sprite by Flareguy for Space Station 14, Harpy Variant By Adeinitas, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), reptilian made by kuro(388673708753027083)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 8699aea5436..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 8bd0b7c6838..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 4e4e93f5a2e..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png index b31411383b8..471347b1ff7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png index c28f18c7734..fbd5291cf76 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png index b25da10d604..a835bd27a0b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png index 51bb5aeba04..f89f3ddea44 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json index 637f260dd62..4fbd43a08b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162, reptilian made by hqlle(444118014024220672). Vox sprite made by Flareguy, Harpy Variant By Adeinitas, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), reptilian made by kuro(388673708753027083)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 2bc6f4a3963..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index c58e3fbad0b..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index dcccd39c3bc..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png index 626856fd5e4..83cd6ef9028 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png index 42e5d0e5e19..442c1230a52 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png index bff0ef69d9e..31fc1a5227d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png index c6c6532bbca..05c21acd9b9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json index 11644185eba..4fbd43a08b5 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:SOL(Артур)#8162, reptilian made by hqlle(444118014024220672). Vox sprite by Flareguy for Space Station 14, Harpy Variant By Adeinitas, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord), reptilian made by kuro(388673708753027083)", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -29,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 00000000000..ba5712a2a65 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png deleted file mode 100644 index 1dc418613e9..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-harpy.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index c4de9bc8778..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 1707fd74df6..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 9579870bdac..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png index 9f18305453e..25c630df78c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png index 3adc8e7cf5e..6788fa2cb23 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png index cac61451dd6..41ba71312a5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png index 7b2c993890a..750412b5d03 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index eb8e477aa02..5807ea29e6d 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/97ec5ed1a0fc8263df5df5a5afbb653d4684992e & icon made by github:Morb0, reptilian made by kuro(388673708753027083). Vox state made by Flareguy for SS14, harpy made by VMSolidus, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", "size": { "x": 32, "y": 32 @@ -15,11 +15,7 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { @@ -29,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 00000000000..6325288e366 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 182dcbd2737..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index a159e887771..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png index ad59c1d3fab..18c9d17ca2d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png index 693d215ff32..39c84373a37 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png index 0c7f537a424..5fb79730ee4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png index 23152285cb1..7592e9e2994 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json index 16d62f8d9de..1bf50218138 100644 --- a/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by svarshiksatanist (Discord)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -15,7 +15,7 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { @@ -25,10 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 00000000000..cc8c04b56b8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png deleted file mode 100644 index a7b07afefa2..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-harpy.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 35f3ee0db7c..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png deleted file mode 100644 index 7bee0c2fdfa..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-resomi.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index 13f9dacef35..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png index 50872d177ea..96272297f22 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png index c125b0affd8..13c3b241faf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index a56067d066c..1bf50218138 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -15,11 +15,7 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-reptilian", + "name": "equipped-OUTERCLOTHING-body-slim", "directions": 4 }, { @@ -29,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-resomi", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png index ea4096f1d2b..96977070ed7 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png index 82a67574828..213ea5ebe82 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png index fb250c4ab1a..1ff3a792af3 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png index 64169d915cc..65a7aba6c3d 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json index 889da66901f..54b1191d425 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d0474ed3b3cc00d0e37fb4c6ec8c10009c178f2c, reptilian made by kuro(388673708753027083)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png index e3165ae3874..b1b0ca09716 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png index e0b825013db..3671a3b548a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png index 17227c0b3b8..77e75f8fb9f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png index e8a676d7afa..46be5288e60 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png index 7e13ba4345e..f1911c7ec0b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json index f4fed8c00bf..bbcef071e2e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), resprited from https://github.com/space-syndicate/space-station-14/commit/ea49d33ef6875a9cac4a328dc24d39771d61debd by Deenkaide (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png index 42fcfa89dce..f260c921e46 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png index 3a0070b150b..3aaa65194da 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CustomId.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CustomId.png new file mode 100644 index 00000000000..3c562130c7a Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/CustomId.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Inspector.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Inspector.png new file mode 100644 index 00000000000..73a64da37c9 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Inspector.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png index e5bdc8fdd93..6f1e55b7de1 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png index d51c905b119..45c3ff0eb3f 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png index 005d97a3f98..b10b1ed71e0 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png index 162442ba685..5f03daac61a 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png index 205002b98f6..6dece6fb58c 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png index 6b7e3cd5da8..39213780481 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index ea35c44f715..69d7f20828d 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -210,6 +210,12 @@ }, { "name": "SecurityClown" + }, + { + "name": "CustomId" + }, + { + "name": "Inspector" } ] } diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png index 45e0c9755e4..a1b463f7896 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png index 53b97f4c783..641a4c22153 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png index 8f905fb9a88..47d410736e7 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png index 638d7509a0a..e0ddcfe7b7e 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png index 14b22cf14a4..d30341b1422 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png index 8223bcca8fa..ce82c248db8 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png index 03e29607792..c31a743f473 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png index ca32a9e17b4..262a6d5f427 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp-on.png differ diff --git a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png index c4c07de99f8..824c488cc59 100644 Binary files a/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png and b/Resources/Textures/Objects/Misc/Lights/lamp.rsi/lamp.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png index 859a9ec99cf..99ca993b0b8 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/admin.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png b/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png new file mode 100644 index 00000000000..a3e83280f72 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/assistant.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png new file mode 100644 index 00000000000..99e10c276d7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/atmospherictechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png new file mode 100644 index 00000000000..24a1b62fe24 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/bartender.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png new file mode 100644 index 00000000000..6958c6d4490 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png new file mode 100644 index 00000000000..4d62c18a60a Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/botanist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png new file mode 100644 index 00000000000..90b9165c049 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/boxer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png new file mode 100644 index 00000000000..72ec0038427 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/captain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png new file mode 100644 index 00000000000..7f5fba10169 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cargotechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png b/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png new file mode 100644 index 00000000000..1ef99e1cef6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/carp.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png new file mode 100644 index 00000000000..9a28b7780c6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cc.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png index 31a7606f986..3ed8b4045a7 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png new file mode 100644 index 00000000000..1e134c3911b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/chaplain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png index 9533b4a686e..11a34b3f053 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/chemist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png new file mode 100644 index 00000000000..24dea8a6d00 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png new file mode 100644 index 00000000000..8a4e8c15d1e Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/cook.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png new file mode 100644 index 00000000000..534150e6de3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/curator.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/death.png b/Resources/Textures/Objects/Misc/id_cards.rsi/death.png new file mode 100644 index 00000000000..c2190596169 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/death.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/department.png b/Resources/Textures/Objects/Misc/id_cards.rsi/department.png new file mode 100644 index 00000000000..001c8d75f5e Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/department.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png b/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png new file mode 100644 index 00000000000..09f48fbb838 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/departmenthead.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png new file mode 100644 index 00000000000..8e21d3539c4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/detective.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png b/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png new file mode 100644 index 00000000000..014c98322aa Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/flame.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png new file mode 100644 index 00000000000..0980bb306c3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/geneticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png new file mode 100644 index 00000000000..407a927b6a4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/gladiator.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png new file mode 100644 index 00000000000..d0b4235c816 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/headofpersonnel.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png index a3e83280f72..3705c6bf4e9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png index 9a28b7780c6..25b7017a708 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idinspector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idinspector.png new file mode 100644 index 00000000000..d2c461b91f8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idinspector.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png new file mode 100644 index 00000000000..5213047636f Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idwizard.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png new file mode 100644 index 00000000000..19eb0d52482 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/janitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png new file mode 100644 index 00000000000..973bbf66e1e Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/lawyer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png b/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png new file mode 100644 index 00000000000..db33a5ead4c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/mailcarrier.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png new file mode 100644 index 00000000000..e49e4478429 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/martialartist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png new file mode 100644 index 00000000000..92832dcaad6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/medicaldoctor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index b62df0ca65a..f7d80b0ba11 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github), Chemist made by Lehmin for Goobstation, idpartymaker idsecurityclown idcommandmaid by lzk228 (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github), Chemist made by Lehmin for Goobstation, idpartymaker idsecurityclown idcommandmaid by lzk228 (github), wizard and idwizard by ScarKy0", "size": { "x": 32, "y": 32 @@ -16,6 +16,168 @@ { "name": "admin" }, + { + "name": "assistant" + }, + { + "name": "atmospherictechnician" + }, + { + "name": "bartender" + }, + { + "name": "black" + }, + { + "name": "botanist" + }, + { + "name": "boxer" + }, + { + "name": "captain" + }, + { + "name": "cargotechnician" + }, + { + "name": "carp" + }, + { + "name": "cc" + }, + { + "name": "chaplain" + }, + { + "name": "chemist" + }, + { + "name": "clown" + }, + { + "name": "cook" + }, + { + "name": "curator" + }, + { + "name": "death" + }, + { + "name": "department" + }, + { + "name": "departmenthead" + }, + { + "name": "detective" + }, + { + "name": "flame" + }, + { + "name": "geneticist" + }, + { + "name": "gladiator" + }, + { + "name": "gold" + }, + { + "name": "headofpersonnel" + }, + { + "name": "janitor" + }, + { + "name": "lawyer" + }, + { + "name": "mailcarrier" + }, + { + "name": "martialartist" + }, + { + "name": "medicaldoctor" + }, + { + "name": "mime" + }, + { + "name": "musician" + }, + { + "name": "orange" + }, + { + "name": "paramedic" + }, + { + "name": "passenger" + }, + { + "name": "pirate" + }, + { + "name": "prisoner" + }, + { + "name": "prisonguard" + }, + { + "name": "psychologist" + }, + { + "name": "rainbow" + }, + { + "name": "roboticist" + }, + { + "name": "rpg" + }, + { + "name": "scientist" + }, + { + "name": "securityofficer" + }, + { + "name": "senior" + }, + { + "name": "shaftminer" + }, + { + "name": "silver" + }, + { + "name": "stationengineer" + }, + { + "name": "subdepartment" + }, + { + "name": "syndicate" + }, + { + "name": "syndie" + }, + { + "name": "visitor" + }, + { + "name": "warden" + }, + { + "name": "wizard" + }, + { + "name": "zookeeper" + }, { "name": "ert_chaplain" }, @@ -35,10 +197,7 @@ "name": "ert_security" }, { - "name": "gold" - }, - { - "name": "idpassenger" + "name": "idadmin" }, { "name": "idatmospherictechnician" @@ -52,6 +211,9 @@ { "name": "idboxer" }, + { + "name": "idbrigmedic" + }, { "name": "idcaptain" }, @@ -76,6 +238,12 @@ { "name": "idclown" }, + { + "name": "idcluwne" + }, + { + "name": "idcommandmaid" + }, { "name": "idcook" }, @@ -95,16 +263,22 @@ "name": "idheadofsecurity" }, { - "name": "idbrigmedic" + "name": "idinspector" }, { - "name": "idcommandmaid" + "name": "idintern-cadet" }, { - "name": "idsecurityclown" + "name": "idintern-med" }, { - "name": "idpartymaker" + "name": "idintern-sci" + }, + { + "name": "idintern-service" + }, + { + "name": "idintern-tech" }, { "name": "idjanitor" @@ -119,82 +293,79 @@ "name": "idmime" }, { - "name": "idparamedic" + "name": "idmusician" }, { - "name": "idpsychologist" + "name": "idparamedic" }, { - "name": "idreporter" + "name": "idpartymaker" }, { - "name": "idprisoner" + "name": "idpassenger" }, { - "name": "idquartermaster" + "name": "idprisoner" }, { - "name": "idresearchdirector" + "name": "idpsychologist" }, { - "name": "idroboticist" + "name": "idquartermaster" }, { - "name": "idscientist" + "name": "idreporter" }, { - "name": "idsecurityofficer" + "name": "idresearchdirector" }, { - "name": "idshaftminer" + "name": "idroboticist" }, { - "name": "idstationengineer" + "name": "idscientist" }, { - "name": "idunknown" + "name": "idsecurityclown" }, { - "name": "idvirologist" + "name": "idsecurityofficer" }, { - "name": "idvisitor" + "name": "idseniorengineer" }, { - "name": "idwarden" + "name": "idseniorofficer" }, { - "name": "idmusician" + "name": "idseniorphysician" }, { - "name": "idzookeeper" + "name": "idseniorresearcher" }, { - "name": "idintern-sci" + "name": "idshaftminer" }, { - "name": "idintern-cadet" + "name": "idstationengineer" }, { - "name": "idintern-med" + "name": "idunknown" }, { - "name": "idintern-service" + "name": "idvirologist" }, { - "name": "idintern-tech" + "name": "idvisitor" }, { - "name": "idadmin" + "name": "idwarden" }, { - "name": "orange" - }, - { - "name": "chemist" + "name": "idwizard" }, { - "name": "pirate" + "name": "idzookeeper" }, { "name": "prisoner_001" @@ -217,27 +388,6 @@ { "name": "prisoner_007" }, - { - "name": "silver" - }, - { - "name": "syndie" - }, - { - "name": "idcluwne" - }, - { - "name": "idseniorengineer" - }, - { - "name": "idseniorresearcher" - }, - { - "name": "idseniorphysician" - }, - { - "name": "idseniorofficer" - }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png new file mode 100644 index 00000000000..8368027151f Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/mime.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png new file mode 100644 index 00000000000..1f1df6370ce Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/musician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png new file mode 100644 index 00000000000..d1f48a111d3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/paramedic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png new file mode 100644 index 00000000000..9f04507a9c5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/passenger.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png new file mode 100644 index 00000000000..ad8052cc01b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisoner.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png new file mode 100644 index 00000000000..f8570b2595c Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/prisonguard.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png new file mode 100644 index 00000000000..d7d24d69470 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/psychologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png b/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png new file mode 100644 index 00000000000..a0ccc1758c8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/rainbow.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png new file mode 100644 index 00000000000..ea7bda6c41e Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/roboticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png b/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png new file mode 100644 index 00000000000..f6aa05e158b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/rpg.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png new file mode 100644 index 00000000000..7942e128b03 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/scientist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png new file mode 100644 index 00000000000..fffc7d2a065 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/securityofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png b/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png new file mode 100644 index 00000000000..28729bd5626 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/senior.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png new file mode 100644 index 00000000000..4b42f5bbb67 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/shaftminer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png new file mode 100644 index 00000000000..c04b4761ea8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/stationengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png b/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png new file mode 100644 index 00000000000..cc1547cbf73 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/subdepartment.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png new file mode 100644 index 00000000000..5ed1c8ffe54 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndicate.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/visitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/visitor.png new file mode 100644 index 00000000000..01432f2a8b9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/visitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png new file mode 100644 index 00000000000..754ac67a883 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/warden.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png new file mode 100644 index 00000000000..d13faa3ab16 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/wizard.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png new file mode 100644 index 00000000000..29b8dbca067 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/zookeeper.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png index 2be12b48a64..039817e37b9 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png index 0ee37e653da..1871b477b63 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png index 7533331b835..819275417ba 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png index 56d1aa2a36a..ba244f3f297 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png index 242f217e4af..305087c37b6 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png index 04057ffa822..f7e231248e5 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png index c23c941e150..2bd8d3837da 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png index 494582986fd..c4603632dff 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json index 84b80b4b7dc..a7211231bb8 100644 --- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0 // Taken from https://github.com/ParadiseSS13/Paradise/", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)", "states": [ { "name": "adv_capacitor" @@ -27,7 +27,6 @@ 0.1, 0.1, 0.1, - 0.1, 0.1 ] ] @@ -54,13 +53,7 @@ "name": "bluespace_matter_bin", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, + 0.3, 0.1, 0.1, 0.1 @@ -83,7 +76,15 @@ ] }, { - "name": "femto_mani" + "name": "femto_mani", + "delays": [ + [ + 0.3, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "hdd1" @@ -113,10 +114,24 @@ "name": "pico_mani" }, { - "name": "quadratic_capacitor" + "name": "quadratic_capacitor", + "delays": [ + [ + 0.3, + 0.1, + 0.1, + 0.1 + ] + ] }, { - "name": "quadultra_micro_laser" + "name": "quadultra_micro_laser", + "delays": [ + [ + 0.1, + 0.1 + ] + ] }, { "name": "rom1" @@ -137,6 +152,7 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] @@ -174,15 +190,7 @@ "name": "super_matter_bin" }, { - "name": "super_scan_module", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "super_scan_module" }, { "name": "treatment_disk" diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png index 0bf4296e9b3..c23eea56f85 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png index c63b141f11d..8dca252f688 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png index 0c3defdefa4..93b2d06f098 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png index 2da4e416464..f3d1ff54dc9 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png index 0cb5de4a3fd..11633f753de 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png index b3bbe275e15..cc907fa5e26 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png index a05d626eea0..b95b803d8f7 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png index 054299f6d7a..d6d1f9d555a 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png index b56c920f7be..54678e59150 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png index 7fa4ceedfbd..240ab514d76 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png index e2fd4e6fbff..d3e7d72b57d 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png differ diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png index 6aec80e9dd5..3e65d639a5e 100644 Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png and b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png index 8f0a816c3f9..d97b1d9764e 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png index 22750af0532..0b0c85a8196 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png index 42695acd7c2..32dd8ae6521 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png index 8877f81e188..ccfecf3dbd1 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png index 973b1428b80..40749be79c1 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_cutter.png differ diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png index ed36af3d67b..5b77cad939e 100644 Binary files a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png and b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_jaws_pry.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png index 4251b56a0f0..5f43e51ee06 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png index 4e964288827..a11f70171fb 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png index 28006d22b05..6fc92446678 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png index 6151b7f44ce..f0b8a4b3ac3 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png index d396f422618..cdcae9ea1f6 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png index 9c6bc8b1647..429c7231b3b 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 007ec65f512..370e9fa5f47 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json @@ -11,13 +11,7 @@ "name": "icon" }, { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] + "name": "primed" }, { "name": "equipped-BELT", diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png index 72df008d651..67f7e86d3a2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png index af0997e1f69..18d88d99af2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/complete.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png index 7e577c3cc6d..b5d5a4c4743 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png index 39d3f2b3653..18d88d99af2 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-payload.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png index c5a39eab1da..26d9c527437 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png index fbdd8455272..2dcd63d3cb6 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png and b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/wired.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png index d6e9ebe4fb9..5448dcd7a47 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png index 6938870e056..c066ca0ef36 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png index 54cdd406404..c6365e6404e 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png index 25d11b7fda5..ef7ca55e19a 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/smoke.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png index cfc9b2a94fc..85a06f2d4d8 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png index ca4383378ba..1fae8574536 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png index dd9542f61f6..32d39cb89f6 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png index 5faf46b224c..e3980eaf108 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png index 61d03a6a791..ca49e02fe31 100644 Binary files a/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png and b/Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png index 6a141b7efb1..1784e7f6236 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png index d68f85845e5..3ff1180051b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png index c9f029f32a3..edcbdbd3851 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png index 8b49392b77d..da73a5f853b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png index 39e05c72114..6a77161ab26 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png index 36c872a4268..a6feb95c36c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png index 39e05c72114..7fbc8f50acf 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png index 8b7d23dc6c4..a36a9226170 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png index 43d1f0f5f71..f32f6862662 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png index 4d7eb62cbf2..0c642312083 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png index 39e05c72114..a3d15b76e69 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton-spent.png index 72ba457dc70..602610dda60 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton.png index c04274e2eab..2c20f418e2a 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/baton.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast-spent.png index 72ba457dc70..df8ffaa201e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png index 1016c3cb156..2ad0feea992 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp-spent.png index 72ba457dc70..602610dda60 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash-spent.png index 72ba457dc70..df8ffaa201e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash.png index 62dded794d8..ea4ac075e29 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag-spent.png index 72ba457dc70..3d14246b4dd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag-spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag-spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png index f000748f7ac..c504fe4ad87 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png index 72ba457dc70..d770bca8401 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png index bc8f94d8c0c..66c1e1c6846 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png index 1dcade47196..bbd5fd452b4 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png index 71fb4211b2f..9b59430db6f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png index 5e45bdbffd7..ec8fafaabc0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png index bcfbb26815e..b57a4a9e258 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png index 203c265c375..1f626393522 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png index cb448146c6e..8c6f4ae6d37 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png index 4042707f210..25065eb6444 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png index efb45f37ab6..44b9c66dea3 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png index 988fecc36a4..caa43ee6081 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png index 44143008c6c..09ac83f2545 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png index 3ba6072f299..84d249d66db 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png index 64943622184..cae420e55b0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png index e04d1254abc..420adbf199f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png index f67facc89b3..05177dd21b0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png index fcb04ff1680..1171c429cdb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png index 5dc3360bbd3..6a537665b2b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png index 510b8fe19ec..c78ed3dfddb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png index 842b8e5ebf5..58a39a29818 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png index d9dd41e903f..75f3bf8faaa 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png index 917b4154867..c9912267ceb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png index fb3bd2209c6..f9c14567855 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png index c24879900ca..844b13cf164 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png index b024dec5e07..59674acf559 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png index d61085019a7..5c6589e9345 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png index d3b34d48ab3..a5a5731c5d5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png index fa241d1742c..812ea8a5caf 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png index 29d519e2c5d..2a3ebca77c5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png index 7575ed150c3..0f158e789e1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png index f8d892f85ba..b531cafeda0 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png index f41552e0529..b1ac1fef6cb 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png index 5a2edcc9970..1e9fe08ea7c 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png index 43639e90f73..dd5f85366d1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png index a1e45f380f1..ebbdbf4e8a7 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png index 3c0c3e3217c..f7286a9ae08 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png index 7f501032572..3fb11afb906 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json index 2d2663c1580..2f1cf988154 100644 --- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json @@ -1,4 +1,4 @@ -{ +{ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3", diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png index c33e51cae63..89d737bb11c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png index 44041c32478..30f71b97f2c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png index 45e87f4f7bd..af1adcaaf0e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json index 71ffade3dd0..83128486b19 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Baystation at commit https://github.com/Baystation12/Baystation12/commit/bddd2b27f6103e46dadb6d251c7c1832e012a84d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -9,87 +9,42 @@ "states": [ { "name": "normal-unshaded", - "directions": 4 - }, - { - "name": "eject-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 - ], - [ - 0.1, - 0.8, - 0.1 + 0.5, + 0.5 ] ] }, + { + "name": "broken" + }, { "name": "deny-unshaded", - "directions": 4, "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] ] }, { - "name": "off", - "directions": 4 + "name": "off" }, { - "name": "broken", - "directions": 4 + "name": "panel" }, { - "name": "panel", - "directions": 4 + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.05, + 0.5, + 0.05, + 0.1 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png index 09951acb4cd..35e8707b84d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png index 31df8b753f8..20b98097dbd 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png index 95ca9554d39..b0b7e5a0f48 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/laptop.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json b/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json index 97c4a26cf1e..b95106c0b70 100644 --- a/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/telecomms.rsi/meta.json @@ -1,4 +1,4 @@ -{ +{ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Sprites by Spangs04, based on servers taken from tgstation at commit https://github.com/tgstation/tgstation/blob/9c3494fd79e6bf8dc532300b9de4f688ff276ac9/icons/obj/machines/telecomms.dmi", diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png index e18913981ba..4dfada706c6 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png b/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png index e1fa09bad31..0dfa469e0e9 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png and b/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png index dffc3059753..3d3839faf49 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png index 851429cc894..c3069d29eb3 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png index 5da3cdfffc2..2f44be481aa 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png index 3bca7f02a65..32195973bbe 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png index 0a07c0a07ea..d20e9077663 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png index 51bfc250a32..5b2077bb4c3 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png index 05e78f74ffe..1dd29ead10b 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png index 0b0ae3554f5..bec83a4c5c1 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png index 9470340c201..5cf46540161 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png index 5a240b23a33..d51164e862e 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json index 55d687bc2e3..2a1c733b0f1 100644 --- a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json @@ -80,18 +80,15 @@ "directions": 1, "delays": [ [ - 0.066, - 0.066, - 0.066, - 0.066, - 0.066, - 0.066, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, 0.5, - 0.066, - 0.066, - 0.066, - 0.066, - 0.066 + 0.1, + 0.1, + 0.1 ] ] }, @@ -100,18 +97,15 @@ "directions": 1, "delays": [ [ - 0.066, - 0.066, - 0.066, - 0.066, - 0.066, - 0.066, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, 0.5, - 0.066, - 0.066, - 0.066, - 0.066, - 0.066 + 0.1, + 0.1, + 0.1 ] ] }, diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png index b874e6739f9..4d1df0f92bd 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png index 73904995587..591ce5992a2 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png index 69b2561266d..8b512a5adee 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png index 0d12654b229..a559cac7b4a 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png index 424481adedf..3675353fd5d 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png index 72d5a43dd9f..f40ddee6b9c 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png index e5200e4f5e7..67c0442f786 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png index 0c4076d2209..7efbdb3cebc 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png index aa0e0b2b717..386dd0845da 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png index 31a6905bbf3..e7d29a34793 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png index 53878b91ee4..039099b3378 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png index a10726d2e76..8b512a5adee 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png index c2a4e109037..f70ab724f25 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png index 8823c7a3812..369177ad4e7 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png index cdcdb11c42d..a28a810df03 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png index 73488bbdc48..a8297830833 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png index 77861e27de8..c1b84af3936 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png index 7ec6433d666..da6d7c57165 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png index 1258071a1a6..52e515e39b8 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png index 9a2c339936a..961991bf349 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png index 30649e06ee8..3e00e7d8068 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png index bd6c7138f62..8daf7770832 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png and b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png index 404e8f84a75..07d323ea2d1 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png index 2fa93039f47..d7cf6a73118 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png index 6bf0743ef23..b6d55ce0e27 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png index a07e117bcaa..068bf07b55d 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png index 951b50c8a59..983d1727955 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png index 85aaf5b6692..4bf4aafad0d 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png index f23ff3cbb1e..71706982943 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png index 1d22d537b3d..feab7c1c9bd 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png index d9f70f9f448..de957954873 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png index 02993f60fdc..9086db2a1ac 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png index 08d71a37f1d..1811ddbf63e 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png index caf2f95d99b..aeea5e305ae 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png index b5b57fd8f63..7d869806105 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png index 6a17485547d..349469262c6 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png index 7100b637334..d17b5298b0e 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png index 8147ba44c81..7ce2c6a4442 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png index 15c9ff89f1a..3a493fda211 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png index dade9aaeb6c..f58738d92ca 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png index 1ca20a8dda4..0f4848a7b35 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png index 6f9c57a119b..d973546e006 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png index af8985e5e41..39fba5953fb 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png index 53f012a6dfe..18a9da738dc 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png index 69b2561266d..8b512a5adee 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png index 94cdd4fa266..c73b9ce0714 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png index 5621e7888ce..d6ff085b181 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png index 75c0a8691d2..5420957a706 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png index 2da9f5719e1..ad024e70a88 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png index 063466641d3..4142c4e1426 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png index bb263257175..7ea3df8bea5 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png index 1ab5486201a..6c986d7596c 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png index 0b14b77aec5..eb7f7999521 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_pressure_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_pressure_unlit.png deleted file mode 100644 index 829185f2710..00000000000 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_pressure_unlit.png and /dev/null differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_temperature_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_temperature_unlit.png deleted file mode 100644 index 67666e1ef2a..00000000000 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/base_temperature_unlit.png and /dev/null differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png index c1984c4f00d..c05a70f82c2 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png index 53bdd1ccf4a..184bd157f07 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png index 555403073b7..da0a8e63f8c 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png index 2a40fddc5b0..92c13304a4f 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png index d0b97a40290..b8fdc7017e5 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png new file mode 100644 index 00000000000..93ae9afd31f Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png index c584771ed1a..2a42b63ae5d 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png index a40cee44beb..817f2fb3f95 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png new file mode 100644 index 00000000000..fb740ee62a0 Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json index 89dd5436482..0f064e16872 100644 --- a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json +++ b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", "size": { "x": 32, "y": 32 @@ -26,12 +26,18 @@ "name": "closing", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -39,12 +45,28 @@ "name": "closing_unlit", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "deny", + "delays": [ + [ + 0.1, + 0.1, + 0.1 ] ] }, @@ -58,6 +80,9 @@ ] ] }, + { + "name": "locked" + }, { "name": "open" }, @@ -65,12 +90,18 @@ "name": "opening", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -78,12 +109,18 @@ "name": "opening_unlit", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -137,60 +174,48 @@ "name": "pressure_unlit", "delays": [ [ - 0.8, + 0.4, 0.4 ] ] }, - { - "name": "bolted_open_unlit" - }, - { - "name": "emergency_open_unlit" - }, { - "name": "base_pressure_unlit", + "name": "pressure_unlit_flat", "delays": [ [ - 0.8, + 0.4, 0.4 ] ] }, { - "name": "pressure_unlit_flat", + "name": "temperature_unlit", "delays": [ [ - 0.8, + 0.4, 0.4 ] ] }, { - "name": "temperature_unlit", + "name": "temperature_unlit_flat", "delays": [ [ - 0.8, + 0.4, 0.4 ] ] }, { - "name": "base_temperature_unlit", - "delays": [ - [ - 0.8, - 0.4 - ] - ] + "name": "bolted_open_unlit" }, { - "name": "temperature_unlit_flat", + "name": "emergency_open_unlit", "delays": [ - [ - 0.8, - 0.4 - ] + [ + 0.4, + 0.4 + ] ] } ] diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png index 6fcb5b059bd..3f19497d1c7 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png index b7a5f9ecca8..45ebb47ec90 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png index 31b1f72af1b..9af41abffa8 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png index 816c648cc49..114f4740af0 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Glass/firelock.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png index ec0074757c8..eb7f7999521 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png index c1984c4f00d..c05a70f82c2 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png index 53bdd1ccf4a..184bd157f07 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png index 419e0506450..fbd603be3ed 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png index b7a5f9ecca8..1d33d3f366a 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png index 9e4b1edb57f..24f74258530 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png index d0b97a40290..b8fdc7017e5 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/closing_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png index 98675fc9278..2eaff3bcae3 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png index c584771ed1a..2a42b63ae5d 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/deny_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png index a40cee44beb..817f2fb3f95 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png index a40cee44beb..817f2fb3f95 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png index d722a8a0f7c..eb7f7999521 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png index 47b5c0067bb..45623c1fc56 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png index 6a8b30b912f..eff24a12fb1 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png index 1717ef54048..a250675f19f 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png index ec2d03812d7..6a2950255ec 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json index 8fe7116f9b9..2c432da2b02 100644 --- a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json +++ b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd. modified by WD team", + "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185. frame3.png, frame4.png by github:Morb0", "size": { "x": 32, "y": 32 @@ -38,12 +38,18 @@ "name": "closing", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -51,12 +57,18 @@ "name": "closing_unlit", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -102,12 +114,18 @@ "name": "opening", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -115,12 +133,18 @@ "name": "opening_unlit", "delays": [ [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] ] }, @@ -169,6 +193,42 @@ 0.4 ] ] + }, + { + "name": "pressure_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "pressure_unlit_flat", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "temperature_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "temperature_unlit_flat", + "delays": [ + [ + 0.4, + 0.4 + ] + ] } ] } diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png index a89b493a8b2..3f19497d1c7 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png index b7a5f9ecca8..45ebb47ec90 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png index 39e81737fbb..6de08c6f063 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png index 816c648cc49..114f4740af0 100644 Binary files a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/opening_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit.png new file mode 100644 index 00000000000..3b4e87f1dad Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit_flat.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit_flat.png new file mode 100644 index 00000000000..fb64ac658cc Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/pressure_unlit_flat.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit.png new file mode 100644 index 00000000000..b6ab456943e Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit.png differ diff --git a/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit_flat.png b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit_flat.png new file mode 100644 index 00000000000..5c553a98653 Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Doors/Airlocks/Standard/firelock.rsi/temperature_unlit_flat.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/atmos_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/atmos_door.png index 43976280240..673ff2736a3 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/atmos_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/atmos_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/black_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/black_door.png index 92632b9f4c0..1a297241656 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/black_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/black_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/blue_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/blue_door.png index 362294d0660..163d9befe63 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/blue_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/blue_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency.png index adc1a5f9039..1bd0e3d1bd1 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_door.png index a4db426752f..9a0dcbd8743 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_open.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_open.png index 13c48821afc..81c00f85e56 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_open.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/emergency_open.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire.png index 19da3301516..d51cd0bfe20 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_door.png index b670493c89c..bb7b6e9d58d 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_open.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_open.png index 3fa1f68bba1..ee2b7cfea1a 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_open.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/fire_open.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic.png index 6806e85f43f..c3607015d36 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_door.png index 07c4d1336d0..1e8326a7430 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_open.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_open.png index 6122db13f86..83448e47e62 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_open.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/generic_open.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/gray_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/gray_door.png index c223f60a3ca..182f28f1a41 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/gray_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/gray_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/green_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/green_door.png index b9c0977ade2..51b2ea29d1c 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/green_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/green_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/locked.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/locked.png index 53f33d7893e..579d46f0697 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/locked.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/locked.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med.png index 231240bb205..07367feddc1 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_door.png index 479297ff34e..1c810b64b53 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_open.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_open.png index 3e34a349c26..70044b48d26 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_open.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/med_open.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/meta.json index 076851ebf5a..5296602011c 100644 --- a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/meta.json +++ b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/meta.json @@ -35,6 +35,7 @@ { "name": "white_door" }, { "name": "yellow_door" }, { "name": "n2" }, - { "name": "n2_door" } + { "name": "n2_door" }, + { "name": "n2_open" } ] } diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/mixed_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/mixed_door.png index dc9a559e57e..25c245e59a5 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/mixed_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/mixed_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2.png index abfe03671e4..39a640d3990 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_door.png index cef4a112128..78693260180 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_open.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_open.png new file mode 100644 index 00000000000..5cee3e47fbe Binary files /dev/null and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/n2_open.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/orange_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/orange_door.png index 893752ea7e7..d205dbcd1d0 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/orange_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/orange_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/pink_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/pink_door.png index a9d23ace4bd..62e15b974fe 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/pink_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/pink_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/red_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/red_door.png index c2e8c6a1ed2..f301ca42f51 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/red_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/red_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/unlocked.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/unlocked.png index 8c761c05adb..fc0dcdb23da 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/unlocked.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/unlocked.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/white_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/white_door.png index 3d42e08b60b..e731b577e7b 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/white_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/white_door.png differ diff --git a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/yellow_door.png b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/yellow_door.png index d321695596d..c9ccbeca293 100644 Binary files a/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/yellow_door.png and b/Resources/Textures/_Maid/Structures/Storage/wall_locker.rsi/yellow_door.png differ