From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Tue, 11 Apr 2023 23:11:01 +0000 (+0300) Subject: [Job] Brigmedic (#15319) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=682c6e02cca1ead5645a6a3ec142aadc8e73e1fb;p=space-station-14.git [Job] Brigmedic (#15319) * [Job] Brigmedic Everything is included! * id meta fix * fix brigmed.yml * brigmed hardsuit migration --- diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 17524b1718..b7fdac5afc 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -3,6 +3,7 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories. job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained. job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Not available on all maps! +job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you. job-description-cadet = Learn the basics of arresting criminals and managing the brig. job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. job-description-cargotech = Deal with requisitions and deliveries for emergencies, pilot the cargo shuttle, and work with others to make ludicrous amounts of cash. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index fbeef390a5..7c09d82bb3 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -1,8 +1,9 @@ -job-name-warden = Warden +job-name-warden = Warden job-name-security = Security Officer job-name-cadet = Security Cadet job-name-hos = Head of Security job-name-detective = Detective +job-name-brigmedic = Brigmedic job-name-scientist = Scientist job-name-research-assistant = Research Assistant job-name-rd = Research Director @@ -57,6 +58,7 @@ JobChiefEngineer = Chief Engineer JobChiefMedicalOfficer = Chief Medical Officer JobClown = Clown JobDetective = Detective +JobBrigmedic = Brigmedic JobERTEngineer = ERT Engineer JobERTJanitor = ERT Janitor JobERTLeader = ERT Leader diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 65f2427cb7..0844fdbf07 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -44,6 +44,35 @@ - id: ClothingHandsGlovesColorBlack - id: ClothingShoesBootsJack +- type: entity + id: LockerBrigmedicFilled + suffix: Brigmedic, Filled + parent: LockerSecurity + components: + - type: StorageFill + contents: + - id: Flash + - id: WeaponDisabler + - id: BrigmedicHypo + - id: ClothingOuterHardsuitBrigmed + - id: EncryptionKeyMedical + - id: BoxSterileMask + - id: MedkitFilled + - id: MedkitCombatFilled + prob: 0.6 + - id: MedkitAdvancedFilled + prob: 0.3 + - id: MedkitOxygenFilled + prob: 0.3 + - id: MedkitBruteFilled + prob: 0.3 + - id: MedkitToxinFilled + prob: 0.3 + - id: MedkitBurnFilled + prob: 0.7 + - id: OmnizineChemistryBottle + prob: 0.1 + - type: entity id: LockerDetectiveFilled suffix: Filled diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index dc7b3e56c7..e40bcdddcc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -231,6 +231,33 @@ Slash: 0.8 Piercing: 0.8 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitBrigmed + name: brigmed hardsuit helmet + description: The lightweight helmet of the brigmed hardsuit. Protects against viruses, and clowns. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/brigmed.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/brigmed.rsi + - type: PointLight + color: "#00FFFF" + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + Radiation: 0.90 + Caustic: 0.90 + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 5500 + - type: DiseaseProtection + protection: 0.15 + - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitWarden diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 8f9d34fad6..aa7cf91ae7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -357,6 +357,36 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitBrigmed + name: brigmed 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 + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/brigmed.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 5500 + - type: DiseaseProtection + protection: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.85 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.9 + Radiation: 0.30 + Caustic: 0.2 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBrigmed + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitWarden diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 8c4385dff6..8715a96bf0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -260,6 +260,19 @@ - type: DiseaseProtection protection: 0.1 +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtBrigmedic + name: brigmedic jumpskirt + description: The uniform is issued to qualified persons who have been trained, but no one cares that the training took place half a day. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi + - type: DiseaseProtection + protection: 0.1 + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtPrisoner diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 56db9832ef..d74993f2b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -385,6 +385,19 @@ - type: DiseaseProtection protection: 0.1 +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBrigmedic + name: brigmedic jumpsuit + description: The uniform is issued to qualified persons who have been trained, but no one cares that the training took place half a day. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi + - type: DiseaseProtection + protection: 0.1 + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitPrisoner diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 5989e8c93a..6d0d02c355 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -427,6 +427,18 @@ - state: green - state: detective +- type: entity + id: SpawnPointBrigmedic + parent: SpawnPointJobBase + name: brigmedic + components: + - type: SpawnPoint + job_id: Brigmedic + - type: Sprite + layers: + - state: green + - state: brigmed + # SPECIAL # ERT - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index f4b934ad54..b419855ec2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -709,6 +709,26 @@ - type: Icon state: pda-detective +- type: entity + parent: BasePDA + id: BrigmedPDA + name: brigmed 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 + - type: PDABorderColor + borderColor: "#A32D26" + accentHColor: "#447987" + accentVColor: "#447987" + - type: Icon + state: pda-brigmed + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + - type: entity parent: ClownPDA id: CluwnePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index b1ba64a8f8..2afbc8f93d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -398,6 +398,18 @@ - type: PresetIdCard job: HeadOfSecurity +- type: entity + parent: IDCardStandard + id: BrigmedIDCard + name: brigmedic ID card + components: + - type: Sprite + layers: + - state: default + - state: idbrigmedic + - type: PresetIdCard + job: Brigmedic + - type: entity parent: IDCardStandard id: CentcomIDCard diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index b08a665274..100e64120b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: hypospray parent: BaseItem description: A sterile injector for rapid administration of drugs to patients. @@ -248,3 +248,28 @@ delay: 0.5 - type: StaticPrice # A new shitcurity meta price: 75 + +- type: entity + name: brigmedic hypospray + parent: BaseItem + description: An injector (most often) of medicines in liquid form, it has a small inscription on it "PROPERTY OF A BRIGMEDIC, HANDS OFF!" + id: BrigmedicHypo + components: + - type: Sprite + sprite: Objects/Specific/Medical/brigmedichypo.rsi + state: hypo + - type: Item + sprite: Objects/Specific/Medical/brigmedichypo.rsi + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 5 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + - type: UseDelay + delay: 2.5 + - type: StaticPrice + price: 550 diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml new file mode 100644 index 0000000000..41e7eeebef --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -0,0 +1,39 @@ +- type: job + id: Brigmedic + name: job-name-brigmedic + description: job-description-brigmedic + playTimeTracker: JobBrigmedic + requirements: + - !type:DepartmentTimeRequirement + department: Medical + time: 18000 + - !type:DepartmentTimeRequirement + department: Security + time: 7200 + startingGear: BrigmedicGear + icon: "Brigmedic" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Medical + - Security + - Brig + - Maintenance + - External + +- type: startingGear + id: BrigmedicGear + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedic + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesColorRed + gloves: ClothingHandsGlovesNitrile + eyes: ClothingEyesHudMedical + head: ClothingHeadHatSurgcapBlue + id: BrigmedPDA + ears: ClothingHeadsetSecurity + mask: ClothingMaskSterile + belt: ClothingBeltMedicalFilled + innerclothingskirt: ClothingUniformJumpskirtBrigmedic + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index b46bc0214d..014ec6b953 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -77,6 +77,7 @@ - SecurityOfficer - Detective - Warden + - Brigmedic - type: department id: Science diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index f8b06580e7..909d57b500 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -64,6 +64,9 @@ - type: playTimeTracker id: JobHeadOfSecurity +- type: playTimeTracker + id: JobBrigmedic + - type: playTimeTracker id: JobJanitor @@ -131,4 +134,4 @@ id: JobBoxer - type: playTimeTracker - id: JobZookeeper \ No newline at end of file + id: JobZookeeper diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon-flash.png new file mode 100644 index 0000000000..621769cd00 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon.png new file mode 100644 index 0000000000..303289b8a8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/meta.json new file mode 100644 index 0000000000..e4a3096a67 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "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 new file mode 100644 index 0000000000..e22fe0f873 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.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/brigmed.rsi/off-inhand-left.png new file mode 100644 index 0000000000..ce1bcd74c2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-right.png new file mode 100644 index 0000000000..ed04109d0d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..e5cb8d6973 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-left.png new file mode 100644 index 0000000000..983d5fd9d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-right.png new file mode 100644 index 0000000000..1496b5b70e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmed.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9c34e65daa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png new file mode 100644 index 0000000000..248bbc910b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/icon.png 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 new file mode 100644 index 0000000000..1d7e0ccdb2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..c68916e433 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/meta.json new file mode 100644 index 0000000000..9ecf4115a9 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmed.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "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/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a914469a4d Binary files /dev/null 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 new file mode 100644 index 0000000000..08890b40e4 Binary files /dev/null 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 new file mode 100644 index 0000000000..6c8173664e Binary files /dev/null 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 new file mode 100644 index 0000000000..5cd44b009f Binary files /dev/null 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 new file mode 100644 index 0000000000..9fe8bf9110 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "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 new file mode 100644 index 0000000000..ac171601fc Binary files /dev/null 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 new file mode 100644 index 0000000000..08890b40e4 Binary files /dev/null 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 new file mode 100644 index 0000000000..6c8173664e Binary files /dev/null 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 new file mode 100644 index 0000000000..5cd44b009f Binary files /dev/null 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 new file mode 100644 index 0000000000..9fe8bf9110 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PuroSlavKing (github) for SS14", + "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/Interface/Misc/job_icons.rsi/Brigmedic.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png new file mode 100644 index 0000000000..fc63ce513a Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.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 3ecce5d124..fec30daa28 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github)", "size": { "x": 8, "y": 8 @@ -100,6 +100,9 @@ { "name": "HeadOfSecurity" }, + { + "name": "Brigmedic" + }, { "name": "MedicalDoctor" }, diff --git a/Resources/Textures/Markers/jobs.rsi/brigmed.png b/Resources/Textures/Markers/jobs.rsi/brigmed.png new file mode 100644 index 0000000000..cec28ec835 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/brigmed.png differ diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index b6f9620c4c..ba34bfd89a 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi, librarian by Peptide. cburn and cluwne made by brainfood1183 (github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi, librarian by Peptide. cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", "size": { "x": 32, "y": 32 @@ -148,6 +148,9 @@ { "name": "security_officer" }, + { + "name": "brigmed" + }, { "name": "miner" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 245f7608b8..01b16f56fc 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", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14, pda-brigmed made by PuroSlavKing (Github)", "size": { "x": 32, "y": 32 @@ -136,6 +136,17 @@ { "name": "pda-security" }, + { + "name": "pda-brigmed", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, { "name": "pda-syndi" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png new file mode 100644 index 0000000000..c8d8be6d0d Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmed.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png new file mode 100644 index 0000000000..a12f705a03 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.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 e7e01531fa..9ed87c6d4c 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", + "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)", "size": { "x": 32, "y": 32 @@ -91,6 +91,9 @@ { "name": "idheadofsecurity" }, + { + "name": "idbrigmedic" + }, { "name": "idjanitor" }, diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png new file mode 100644 index 0000000000..dab595ca54 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png new file mode 100644 index 0000000000..071b9f0b1a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png new file mode 100644 index 0000000000..d8f2d290e4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png new file mode 100644 index 0000000000..d8f2d290e4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json new file mode 100644 index 0000000000..c06bee8412 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from syndicate station from PR https://github.com/space-syndicate/space-station-14/pull/422, sprite modified by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hypo" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}