From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Wed, 26 Apr 2023 06:48:44 +0000 (+0300) Subject: [Brigmedic] Something like a "big update" (#15496) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=509761c26072ea1097e5c54a52dd28ca3da8f9cb;p=space-station-14.git [Brigmedic] Something like a "big update" (#15496) * [Brigmedic] Something like a "big update" * new locker * hardsuit resprite * resprite resprited hardsuit back to the future * custom headset * remove key * TrackingImplanter in locker * pda UI fix * brigmedic bedsheet * added transparency * mask * desc * name mask * skirt of life * Suits resprite * PDA resprite | Brigmed - Brigmedic * meta dic :) * Beret + medical gown * backpacks * locker fill update * why not? bzzz Moth-pocalypse * Brigmed - Brigmedic * fix * chance update --- diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index f067db4cc1..33dceb942c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -28,6 +28,16 @@ - id: BoxSurvivalSecurity - id: Flash +- type: entity + noSpawn: true + parent: ClothingBackpackBrigmedic + id: ClothingBackpackBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalBrigmedic + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackMedical diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 97400242ff..2d6de7011f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -27,6 +27,16 @@ - id: BoxSurvivalSecurity - id: Flash +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelBrigmedic + id: ClothingBackpackDuffelBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalBrigmedic + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackDuffelMedical diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index cb9f4e9d92..475be4a39b 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -27,6 +27,16 @@ - id: BoxSurvivalSecurity - id: Flash +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelBrigmedic + id: ClothingBackpackSatchelBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalBrigmedic + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackSatchelMedical diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 049780a926..4cdd8722bb 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -56,6 +56,26 @@ - state: internals - state: emergencytank +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvivalBrigmedic + description: It's a box with basic internals inside. + suffix: Medical + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedicalSecurity + - id: EmergencyOxygenTankFilled + - id: SpaceMedipen + - id: EmergencyMedipen + - id: EmergencyMedipen + - id: FoodTinMRE + - type: Sprite + layers: + - state: internals + - state: emergencytank + - type: entity name: survival box parent: BoxCardboard diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 8481647d87..e46187a28f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -47,20 +47,26 @@ - type: entity id: LockerBrigmedicFilled suffix: Brigmedic, Filled - parent: LockerSecurity + parent: LockerBrigmedic components: - type: StorageFill contents: - - id: Flash - id: WeaponDisabler - - id: ClothingOuterHardsuitBrigmed - - id: EncryptionKeyMedical + - id: TrackingImplanter + amount: 2 + - id: ClothingOuterHardsuitBrigmedic - id: BoxSterileMask + - id: ClothingHeadHatBeretBrigmedic + - id: ClothingOuterCoatAMG + - id: ClothingUniformJumpsuitBrigmedic + - id: ClothingUniformJumpskirtBrigmedic + - id: ClothingUniformJumpskirtOfLife + prob: 0.1 - id: MedkitFilled - id: MedkitCombatFilled prob: 0.6 - id: MedkitAdvancedFilled - prob: 0.3 + prob: 0.4 - id: MedkitOxygenFilled prob: 0.3 - id: MedkitBruteFilled @@ -69,6 +75,8 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 + - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse + prob: 0.15 - type: entity id: LockerDetectiveFilled diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 9e1a1dc94c..ea0f951e83 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -60,6 +60,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/security.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackBrigmedic + name: brigmedic backpack + description: It's a very sterile backpack. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/brigmedic.rsi + - type: entity parent: ClothingBackpack id: ClothingBackpackEngineering diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index c7a9a23d5e..8398df50f5 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -75,6 +75,15 @@ - type: Sprite sprite: Clothing/Back/Duffels/security.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBrigmedic + name: brigmedic duffel bag + description: A large duffel bag for holding extra medical related goods. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/brigmedic.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelChemistry diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 06398707e4..67f43c1f9c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -108,6 +108,15 @@ - type: Sprite sprite: Clothing/Back/Satchels/security.rsi +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelBrigmedic + name: brigmedic satchel + description: A sterile satchel for medical related needs. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/brigmedic.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelCaptain diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 5b562ac95f..8b5a4a37e0 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -223,6 +223,23 @@ - type: Clothing sprite: Clothing/Ears/Headsets/security.rsi +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetBrigmedic + name: brigmedic headset + description: A headset that helps to hear the death cries. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyMedical + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/brigmedic.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/brigmedic.rsi + - type: entity parent: ClothingHeadset id: ClothingHeadsetService diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 7c9fbfce2a..98106b7444 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -233,15 +233,15 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitBrigmed + id: ClothingHeadHelmetHardsuitBrigmedic noSpawn: true - name: brigmed hardsuit helmet - description: The lightweight helmet of the brigmed hardsuit. Protects against viruses, and clowns. + name: brigmedic hardsuit helmet + description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns. components: - type: Sprite - sprite: Clothing/Head/Hardsuits/brigmed.rsi + sprite: Clothing/Head/Hardsuits/brigmedic.rsi - type: Clothing - sprite: Clothing/Head/Hardsuits/brigmed.rsi + sprite: Clothing/Head/Hardsuits/brigmedic.rsi - type: PointLight color: "#00FFFF" - type: Armor diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 74e3dbb25c..d4d488e8cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -64,6 +64,17 @@ - type: Clothing sprite: Clothing/Head/Hats/beret_warden.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretBrigmedic + name: medical beret + description: White beret, looks like a cream pie on the head. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_brigmedic.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_brigmedic.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBowlerHat diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 5fdad8fa1f..80d70c95f8 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -121,6 +121,22 @@ - PetWearable - WhitelistChameleon +- type: entity + parent: ClothingMaskBreathMedical + id: ClothingMaskBreathMedicalSecurity + name: military-style medical mask + description: A medical mask with a small layer of protection against damage and viruses, similar to the one used in the medical units of the first corporate war. + components: + - type: Sprite + sprite: Clothing/Mask/medicalsecurity.rsi + - type: Clothing + sprite: Clothing/Mask/medicalsecurity.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + - type: entity parent: ClothingMaskPullableBase id: ClothingMaskBreath diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index ef857d39b8..9da2bd29ac 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -251,3 +251,22 @@ sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatAMG + name: armored medical gown + description: The version of the medical gown, with elements of a bulletproof vest, looks strange, but your heart is protected. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/brigmedic.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/brigmedic.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.85 + Piercing: 0.65 + Heat: 0.85 + Caustic: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 6c0835aa59..2ea005b097 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -368,14 +368,14 @@ - type: entity parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitBrigmed - name: brigmed hardsuit + id: ClothingOuterHardsuitBrigmedic + name: brigmedic hardsuit description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. components: - type: Sprite - sprite: Clothing/OuterClothing/Hardsuits/brigmed.rsi + sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi - type: Clothing - sprite: Clothing/OuterClothing/Hardsuits/brigmed.rsi + sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 5500 @@ -394,7 +394,7 @@ Radiation: 0.30 Caustic: 0.2 - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitBrigmed + clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic - type: entity parent: ClothingOuterHardsuitBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 8715a96bf0..977d0c1883 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -663,3 +663,14 @@ sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtOfLife + name: skirt of life + description: A skirt that symbolizes the joy and positivity of our life. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/skirtoflife.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 2fa26f3e95..06f9bb37db 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -453,7 +453,7 @@ - type: Sprite layers: - state: green - - state: brigmed + - state: brigmedic # SPECIAL # ERT diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 860c37355c..af011f5c67 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -720,19 +720,19 @@ - type: entity parent: BasePDA - id: BrigmedPDA - name: brigmed PDA + id: BrigmedicPDA + name: brigmedic PDA description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer. components: - type: PDA - id: BrigmedIDCard - state: pda-brigmed + id: BrigmedicIDCard + state: pda-brigmedic - type: PDABorderColor borderColor: "#A32D26" - accentHColor: "#447987" - accentVColor: "#447987" + accentHColor: "#d7d7d0" + accentVColor: "#d7d7d0" - type: Icon - state: pda-brigmed + state: pda-brigmedic - type: HealthAnalyzer scanDelay: 1 scanningEndSound: diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index f2b48fadd2..da73725efc 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: BedsheetBase name: BedsheetBase @@ -265,6 +265,17 @@ - type: Clothing sprite: Clothing/Neck/Bedsheets/rd.rsi +- type: entity + id: BedsheetBrigmedic + parent: BedsheetBase + name: Brigmedic's bedsheet + description: Not worse than cotton. + components: + - type: Sprite + state: sheetrd + - type: Clothing + sprite: Clothing/Neck/Bedsheets/brigmedic.rsi + - type: entity id: BedsheetRed parent: BedsheetBase diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 2afbc8f93d..41235c8aba 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -400,7 +400,7 @@ - type: entity parent: IDCardStandard - id: BrigmedIDCard + id: BrigmedicIDCard name: brigmedic ID card components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index b4a8db3996..1276d5e189 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -306,6 +306,21 @@ - type: AccessReader access: [["Armory"]] +# Brigmedic +- type: entity + id: LockerBrigmedic + parent: LockerBaseSecure + name: brigmedic locker + components: + - type: Appearance + visuals: + - type: StorageVisualizer + state: brigmedic + state_open: armory_open + state_closed: brigmedic_door + - type: AccessReader + access: [["Medical"]] + # Security Officer - type: entity id: LockerSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 41e7eeebef..f8d6395ba0 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -25,15 +25,16 @@ id: BrigmedicGear equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic - back: ClothingBackpackSecurityFilled + outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackBrigmedicFilled shoes: ClothingShoesColorRed gloves: ClothingHandsGlovesNitrile eyes: ClothingEyesHudMedical - head: ClothingHeadHatSurgcapBlue - id: BrigmedPDA - ears: ClothingHeadsetSecurity - mask: ClothingMaskSterile + head: ClothingHeadHatBeretBrigmedic + id: BrigmedicPDA + ears: ClothingHeadsetBrigmedic + mask: ClothingMaskBreathMedicalSecurity belt: ClothingBeltMedicalFilled innerclothingskirt: ClothingUniformJumpskirtBrigmedic - satchel: ClothingBackpackSatchelSecurityFilled - duffelbag: ClothingBackpackDuffelSecurityFilled + satchel: ClothingBackpackSatchelBrigmedicFilled + duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..37a5937690 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..0687555719 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..d06bc5c050 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..eda68924f6 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..477c522785 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..7fd84d54e1 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..c894a9f04c Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..0b74d694c3 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..2282658959 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..477c522785 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..09f3fce48f Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..3c3fc16546 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..66229364c5 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..51b618480d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..477c522785 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png new file mode 100644 index 0000000000..527a02843a Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..c2160a1d86 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..529b60f838 --- /dev/null +++ b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by PuroSlavKing (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-equipped-HELMET.png deleted file mode 100644 index 66bb40bb50..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon-flash.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon-flash.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/icon.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/meta.json rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..68f95ad9fd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-left.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-right.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-left.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-right.png rename to Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9a6ed93c6d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png new file mode 100644 index 0000000000..e64e214856 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..b516a3930b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..cc35f7a123 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json new file mode 100644 index 0000000000..11ea5a5b10 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png new file mode 100644 index 0000000000..fc5b490622 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-cat.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png new file mode 100644 index 0000000000..a39c2778b0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-dog.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png new file mode 100644 index 0000000000..7554106bc4 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-fox.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png new file mode 100644 index 0000000000..899eeb0bc2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pig.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png new file mode 100644 index 0000000000..20fc7da643 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-possum.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png new file mode 100644 index 0000000000..c6d1968388 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-puppy.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png new file mode 100644 index 0000000000..aebfd61042 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-sloth.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png new file mode 100644 index 0000000000..aa30ac4e00 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png new file mode 100644 index 0000000000..91eb353b2f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png new file mode 100644 index 0000000000..dc764f1531 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png new file mode 100644 index 0000000000..97610dee5f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json new file mode 100644 index 0000000000..9a2ea46c4c --- /dev/null +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by LinkUyx#6557", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-dog", + "directions": 4 + }, + { + "name": "equipped-MASK-puppy", + "directions": 4 + }, + { + "name": "equipped-MASK-fox", + "directions": 4 + }, + { + "name": "equipped-MASK-cat", + "directions": 4 + }, + { + "name": "equipped-MASK-sloth", + "directions": 4 + }, + { + "name": "equipped-MASK-possum", + "directions": 4 + }, + { + "name": "equipped-MASK-pig", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..98e2b15b36 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/equipped-NECK.png new file mode 100644 index 0000000000..96c8fb4907 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..fb204ba68a Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..5ef039337a Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..a73088ab2c --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Bedsheets/brigmedic.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3, brigmedic bedsheet sprited by RudeyCoolLeet#3875", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9e96b9e48a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..69ab367846 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..48eae2b05b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..582296eb74 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json new file mode 100644 index 0000000000..13bf861137 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Hülle#2562 (Discord) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index c2bdbdae8f..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png deleted file mode 100644 index 67c59c5b95..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-left.png deleted file mode 100644 index 03dad74a2d..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-right.png deleted file mode 100644 index 307618c335..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..62ff24def9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png new file mode 100644 index 0000000000..2fa0358ff6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png new file mode 100644 index 0000000000..d0f9634e3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png new file mode 100644 index 0000000000..b7d4d3b153 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index a914469a4d..081fd4fc04 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png index 08890b40e4..d8b61ee3e0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png index 6c8173664e..580490e1d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png index 5cd44b009f..19404ed83c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json index 9fe8bf9110..ec078ac0d8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", + "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2dadd8fea5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/icon.png new file mode 100644 index 0000000000..bdf3551280 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-left.png new file mode 100644 index 0000000000..370d7c804d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-right.png new file mode 100644 index 0000000000..b9437980f7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/meta.json new file mode 100644 index 0000000000..4b75a91ede --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/skirtoflife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by LinkUyx#6557", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index ac171601fc..160d5a94ab 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index 08890b40e4..c0a4aa3346 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png index 6c8173664e..fbb4b5e7a4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index 5cd44b009f..35244353f1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json index 9fe8bf9110..ec078ac0d8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14", + "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Markers/jobs.rsi/brigmed.png b/Resources/Textures/Markers/jobs.rsi/brigmedic.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/brigmed.png rename to Resources/Textures/Markers/jobs.rsi/brigmedic.png diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index b46d3f88ce..25e636d401 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -152,7 +152,7 @@ "name": "security_officer" }, { - "name": "brigmed" + "name": "brigmedic" }, { "name": "miner" diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 7fa756f9a6..050843326e 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14, pda-brigmed and pda-centcom made by PuroSlavKing (Github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord)", "size": { "x": 32, "y": 32 @@ -137,7 +137,7 @@ "name": "pda-security" }, { - "name": "pda-brigmed", + "name": "pda-brigmedic", "delays": [ [ 0.3, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png deleted file mode 100644 index c8d8be6d0d..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png new file mode 100644 index 0000000000..684aaaac1f Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png differ diff --git a/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json b/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json index 4d311b1034..f91263ff9a 100644 --- a/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3, sheetbrigmedic sprited by RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 @@ -92,6 +92,9 @@ { "name": "sheetrd" }, + { + "name": "sheetbrigmedic" + }, { "name": "sheetred" }, diff --git a/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png b/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png new file mode 100644 index 0000000000..d35b45c43e Binary files /dev/null and b/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png new file mode 100644 index 0000000000..3946b284e6 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png new file mode 100644 index 0000000000..0534af870c Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 1e3a37a001..b7852c6924 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation", + "copyright": "Taken from tgstation, brigmedic locker is a resprited armory by PuroSlavKing (Github)", "license": "CC-BY-SA-3.0", "states": [ { @@ -28,6 +28,12 @@ { "name": "alien_open" }, + { + "name": "brigmedic_door" + }, + { + "name": "brigmedic" + }, { "name": "armory" },