diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 5ffca9a0cb..13c3c9659a 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -47,6 +47,7 @@ job-description-musician = Entertain the crew with your unique musical talents. job-description-passenger = Enjoy your stay aboard the station with no obligations! job-description-reporter = Inform and entertain the station's crew with wireless cameras and news bulletins. job-description-serviceworker = Assist the bar and kitchen with providing sustenance to the crew. +job-description-tram-driver = Drive around a tram from stop to stop. # Silicon job-description-borg = Use your robotic chassis to perform a wide variety of specialized tasks. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index d20d2a7e6f..1f57c103bf 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -46,6 +46,7 @@ job-name-security = Security Officer job-name-serviceworker = Service Worker job-name-station-ai = Station AI job-name-technical-assistant = Technical Assistant +job-name-tram-driver = Tram Driver job-name-visitor = Visitor job-name-warden = Warden diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 06a891a746..0258bc8dfe 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -208,3 +208,8 @@ loadout-group-reporter-head = Reporter hat loadout-group-reporter-outerclothing = Reporter vest loadout-group-psychologist-jumpsuit = Psychologist jumpsuit + +loadout-group-tramdriver-jumpsuit = Tram driver jumpsuit +loadout-group-tramdriver-outerclothing = Tram driver suit +loadout-group-tramdriver-hat = Tram driver hat +loadout-group-tramdriver-gloves = Tram driver gloves diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 1aa5c3d56f..c54bcf3693 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -1551,3 +1551,19 @@ sprite: Clothing/Head/Hats/mitre_clown.rsi - type: Clothing sprite: Clothing/Head/Hats/mitre_clown.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatTramDriver + name: tram driver hat + description: It smells like confidence. + components: + - type: Sprite + sprite: Clothing/Head/Hats/tramdriver.rsi + - type: Clothing + sprite: Clothing/Head/Hats/tramdriver.rsi + - type: Tag + tags: + - ClothMade + - Recyclable + - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 2c13dade47..de24b555e4 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -54,3 +54,18 @@ - Recyclable - HamsterWearable - WhitelistChameleon + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieSerious + name: serious tie + description: A perfectly tied tie to get you through the working day. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/serioustie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/serioustie.rsi + - type: Item + storedSprite: + state: storage + sprite: Clothing/Neck/Ties/serioustie.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 15b615e230..fe4a013177 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -308,3 +308,13 @@ - type: StaticPrice price: 1500 +- type: entity + parent: ClothingOuterBase + id: ClothingOuterSuitTramDriver + name: tram driver suit + description: It protects from everything that could distract you. That is, nothing at all. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/tramdriver.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Suits/tramdriver.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 77dcfd290d..a49ad4d289 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -894,6 +894,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/psychologist.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitTramDriver + name: tram driver jumpsuit + description: Perfectly ironed, for well-prepared professionals. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/tramdriver.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/tramdriver.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitReporter diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 108c65c3cc..ed98a64614 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -594,3 +594,15 @@ layers: - state: green - state: psychologist + +- type: entity + id: SpawnPointTramDriver + parent: SpawnPointJobBase + name: tramdriver + components: + - type: SpawnPoint + job_id: TramDriver + - type: Sprite + layers: + - state: green + - state: tramdriver diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 316ca08e93..b84efe64c3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1284,6 +1284,25 @@ - type: Icon state: pda-medical +- type: entity + parent: BasePDA + id: TramDriverPDA + name: tram driver PDA + description: A serious driver will always arrive on time. + components: + - type: Pda + id: TramDriverIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-tramdriver + - type: PdaBorderColor + borderColor: "#454a50" + accentVColor: "#ffc500" + - type: Icon + state: pda-tramdriver + - type: entity parent: BasePDA id: ReporterPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index abf9760f11..95fb705b6e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -801,6 +801,24 @@ offset: *icon-offset state: Zookeeper +- type: entity + parent: IDCardStandard + id: TramDriverIDCard + name: tram driver ID card + components: + - type: Sprite + layers: + - state: default + - state: stripe_top + color: "#ffc500" + - state: stripe_bottom + color: "#454a50" + - sprite: *icon-rsi + offset: *icon-offset + state: TramDriver + - type: PresetIdCard + job: TramDriver + #Supply - type: entity diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/tramdriver.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/tramdriver.yml new file mode 100644 index 0000000000..51d7e23800 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/tramdriver.yml @@ -0,0 +1,28 @@ +# Jumpsuit +- type: loadout + id: TramDriverJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitTramDriver + +# Outer clothing +- type: loadout + id: TramDriverSuit + equipment: + outerClothing: ClothingOuterSuitTramDriver + +# Hat +- type: loadout + id: TramDriverHat + equipment: + head: ClothingHeadHatTramDriver + +# Glove +- type: loadout + id: TramDriverGlovesWhite + equipment: + head: ClothingHandsGlovesColorWhite + +- type: loadout + id: TramDriverGlovesBlack + equipment: + head: ClothingHandsGlovesColorBlack diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml index b79dc76913..9aeef9198b 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml @@ -1337,6 +1337,35 @@ # minLimit: 0 # loadouts: +- type: loadoutGroup + id: TramDriverJumpsuit + name: loadout-group-tramdriver-jumpsuit + minLimit: 1 + maxLimit: 1 + loadouts: + - TramDriverJumpsuit + +- type: loadoutGroup + id: TramDriverOuterClothing + name: loadout-group-tramdriver-outerclothing + minLimit: 0 + loadouts: + - TramDriverSuit + +- type: loadoutGroup + id: TramDriverHat + name: loadout-group-tramdriver-hat + loadouts: + - TramDriverHat + +- type: loadoutGroup + id: TramDriverGloves + name: loadout-group-tramdriver-gloves + minLimit: 0 + loadouts: + - TramDriverGlovesWhite + - TramDriverGlovesBlack + # Other - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml index 9068ea1324..bfd0bbdc01 100644 --- a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml @@ -491,6 +491,21 @@ #- PsychologistJobTrinkets - GroupSpeciesBreathTool +- type: roleLoadout + id: JobTramDriver + groups: + - GroupTankHarness + - CommonBackpack + - TramDriverJumpsuit + - TramDriverOuterClothing #Vest and such + - TramDriverHat + - TramDriverGloves + - Glasses + - Survival + - Trinkets + #- TramDriverJobTrinkets + - GroupSpeciesBreathTool + # These loadouts are used for non-crew spawns, like off-station antags and event mobs # They will be used without player configuration, thus they will only ever apply what is forced by MinLimit diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml index 6533f9fc6c..f8aa70d842 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml @@ -138,6 +138,7 @@ - ClothingUniformJumpsuitMime - ClothingUniformJumpskirtMime - ClothingUniformJumpsuitMusician + - ClothingUniformJumpsuitTramDriver - type: latheRecipePack id: WinterCoats @@ -177,6 +178,7 @@ - ClothingNeckTieRed - ClothingNeckTieDet - ClothingNeckTieSci + - ClothingNeckTieSerious - type: latheRecipePack id: Scarves diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 77648a96dd..b82186ff38 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -617,6 +617,22 @@ id: ClothingUniformJumpskirtWarden result: ClothingUniformJumpskirtWarden +## Tram Driver +- type: latheRecipe + parent: BaseJumpsuitRecipe + id: ClothingUniformJumpsuitTramDriver + result: ClothingUniformJumpsuitTramDriver + +- type: latheRecipe + parent: BaseCoatRecipe + id: ClothingOuterSuitTramDriver + result: ClothingOuterSuitTramDriver + +- type: latheRecipe + parent: BaseHatRecipe + id: ClothingHeadHatTramDriver + result: ClothingHeadHatTramDriver + # Command winter coats - type: latheRecipe parent: BaseCommandCoatRecipe @@ -923,6 +939,11 @@ id: ClothingNeckTieSci result: ClothingNeckTieSci +- type: latheRecipe + parent: BaseNeckClothingRecipe + id: ClothingNeckTieSerious + result: ClothingNeckTieSerious + # Scarfs - type: latheRecipe parent: BaseNeckClothingRecipe diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml new file mode 100644 index 0000000000..4e11747908 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/tramdriver.yml @@ -0,0 +1,38 @@ +- type: job + id: TramDriver + name: job-name-tram-driver + description: job-description-tram-driver + playTimeTracker: JobTramDriver + startingGear: TramDriverGear + icon: "JobIconTramDriver" + supervisors: job-supervisors-hop + requirements: + - !type:OverallPlaytimeRequirement # someone that's not doing this job will just be a pain for the station + time: 10h + access: + - Maintenance + - Service # the tram has command + service access + - External # to pick up people trapped in the tramway's space + special: # we don't want it becoming an antag... for now at least + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: TramDriverGear + equipment: + shoes: ClothingShoesBootsLaceup + id: TramDriverPDA + ears: ClothingHeadsetService + neck: ClothingNeckTieSerious + +- type: chameleonOutfit + id: TramDriverChameleonOutfit + job: TramDriver + equipment: + head: ClothingHeadHatTramDriver + eyes: ClothingEyesGlasses + mask: ClothingMaskBreath + outerClothing: ClothingOuterSuitTramDriver + neck: ClothingNeckTieSerious + belt: ClothingBeltUtility + gloves: ClothingHandsGlovesColorWhite diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6294657ab3..973ff9c1b5 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -30,6 +30,7 @@ - Reporter - Visitor - ServiceWorker + - TramDriver - type: department id: CentralCommand @@ -139,4 +140,5 @@ roles: - Reporter - Psychologist + - TramDriver primary: false diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 1bc37757ce..f60fb025cd 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -142,6 +142,9 @@ - type: playTimeTracker id: JobTechnicalAssistant +- type: playTimeTracker + id: JobTramDriver + - type: playTimeTracker id: JobVisitor diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 60a4e935ce..f908377ad9 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -323,6 +323,14 @@ state: Zookeeper jobName: job-name-zookeeper +- type: jobIcon + parent: JobIcon + id: JobIconTramDriver + icon: + sprite: *icon-rsi + state: TramDriver + jobName: job-name-tramdriver + # Entertainer (like service, but not actually service) - type: jobIcon diff --git a/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a0a703aae2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/icon.png new file mode 100644 index 0000000000..94eb5e86bc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-left.png new file mode 100644 index 0000000000..fd40becdef Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-right.png new file mode 100644 index 0000000000..ac3f849df4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/meta.json new file mode 100644 index 0000000000..a33d0f6bc1 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/tramdriver.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "By ketufaispikinut", + "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/Neck/Ties/serioustie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/equipped-NECK.png new file mode 100644 index 0000000000..768d7e8391 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/icon.png b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/icon.png new file mode 100644 index 0000000000..434c1316e0 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-left.png new file mode 100644 index 0000000000..7356054278 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-right.png new file mode 100644 index 0000000000..1ffa084a8f Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/meta.json new file mode 100644 index 0000000000..efa1c18c01 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By ketufaispikinut. Icon state modified from a sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and edited by Flareguy for Space Station 14 (dettie.rsi)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "storage" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/storage.png b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/storage.png new file mode 100644 index 0000000000..e66680b058 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/serioustie.rsi/storage.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..56cdc4b911 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/icon.png new file mode 100644 index 0000000000..82de278e2a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-left.png new file mode 100644 index 0000000000..c582f154b5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-right.png new file mode 100644 index 0000000000..5f079a6de6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/meta.json new file mode 100644 index 0000000000..e8d1ec5255 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/tramdriver.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "By ketufaispikinut", + "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/Jumpsuit/tramdriver.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..51e86ac6dc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/icon.png new file mode 100644 index 0000000000..86cbb94f46 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-left.png new file mode 100644 index 0000000000..d7457c3236 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-right.png new file mode 100644 index 0000000000..2dfabe8f97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/meta.json new file mode 100644 index 0000000000..fc29d2859b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tramdriver.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "By ketufaispikinut", + "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/TramDriver.png b/Resources/Textures/Interface/Misc/job_icons.rsi/TramDriver.png new file mode 100644 index 0000000000..a476ed7e9b Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/TramDriver.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 947af04c73..4b0a02061c 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 and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github), ninja icon by ThatGuyUSA (github), sus icon by YoungThugSS14 (github)", + "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github), ninja icon by ThatGuyUSA (github), sus icon by YoungThugSS14 (github), TramDriver based on ServiceWorker and made by ketufaispikinut (github)", "size": { "x": 8, "y": 8 @@ -246,6 +246,9 @@ }, { "name": "Zombie" + }, + { + "name": "TramDriver" } ] } diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index ce53eab3eb..abfe99866a 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 | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github). tramdriver by Ketufaispikinut", "size": { "x": 32, "y": 32 @@ -199,6 +199,9 @@ { "name": "technicalassistant" }, + { + "name": "tramdriver" + }, { "name": "virologist" }, diff --git a/Resources/Textures/Markers/jobs.rsi/tramdriver.png b/Resources/Textures/Markers/jobs.rsi/tramdriver.png new file mode 100644 index 0000000000..b3e9c3c9bd Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/tramdriver.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 984030280f..a44b05cce5 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -250,6 +250,9 @@ 0.3 ] ] + }, + { + "name": "pda-tramdriver" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-tramdriver.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-tramdriver.png new file mode 100644 index 0000000000..bca9e37bef Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-tramdriver.png differ