diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 7a3d0f18979..9c3a4b34b11 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -19,8 +19,8 @@ #define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenoarchaeologist, /datum/job/xenobiologist, /datum/job/xenobotanist, /datum/job/intern_sci) #define MEDICAL_ROLES list(/datum/job/doctor, /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, /datum/job/med_tech, /datum/job/intern_med) #define ENGINEERING_ROLES list(/datum/job/engineer, /datum/job/atmos, /datum/job/intern_eng) -#define SERVICE_ROLES list(/datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/journalist, /datum/job/librarian) -#define CIVILIAN_ROLES list(/datum/job/assistant, /datum/job/visitor) +#define SERVICE_ROLES list(/datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/librarian) +#define CIVILIAN_ROLES list(/datum/job/assistant, /datum/job/visitor, /datum/job/journalist) #define NON_CREW_CIVILIAN_ROLES list(/datum/job/passenger, /datum/job/merchant) #define SECURITY_ROLES list(/datum/job/warden, /datum/job/investigator, /datum/job/officer, /datum/job/intern_sec) #define OPERATIONS_ROLES list(/datum/job/hangar_tech, /datum/job/mining, /datum/job/machinist) @@ -38,4 +38,4 @@ #define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE) #define ORION_ROLES list(OPERATIONS_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE, SERVICE_ROLES) -#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, JOURNALIST_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE) +#define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE, JOURNALIST_ROLE) diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 54350cbc07c..ba08bd748d2 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -45,6 +45,7 @@ "Atmospheric Technician" = /datum/outfit/job/atmos/hephaestus, "Engineering Apprentice" = /datum/outfit/job/intern_eng/hephaestus, "Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/hephaestus, + "Corporate Reporter" = /datum/outfit/job/journalist/hephaestus, "Corporate Liaison" = /datum/outfit/job/representative/hephaestus, "Off-Duty Crew Member" = /datum/outfit/job/visitor/hephaestus ) @@ -151,6 +152,18 @@ /obj/item/stamp/hephaestus = 1 ) +/datum/outfit/job/journalist/hephaestus + name = "Corporate Reporter - Hephaestus" + + uniform = /obj/item/clothing/under/librarian/heph + id = /obj/item/card/id/hephaestus + + backpack_faction = /obj/item/storage/backpack/heph + satchel_faction = /obj/item/storage/backpack/satchel/heph + dufflebag_faction = /obj/item/storage/backpack/duffel/heph + messengerbag_faction = /obj/item/storage/backpack/messenger/heph + + /datum/outfit/job/visitor/hephaestus name = "Off-Duty Crew Member - Hephaestus" diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index de2e65d3688..453f3ba7eb1 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -50,6 +50,7 @@ "Psychologist" = /datum/outfit/job/psychiatrist/pmc, "First Responder" = /datum/outfit/job/med_tech/pmc, "Medical Intern" = /datum/outfit/job/intern_med/pmc, + "Corporate Reporter" = /datum/outfit/job/journalist/pmc, "Corporate Liaison" = /datum/outfit/job/representative/pmc, "Off-Duty Crew Member" = /datum/outfit/job/visitor/pmc ) @@ -208,6 +209,17 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg +/datum/outfit/job/journalist/pmc + name = "Corporate Reporter - PMC" + + uniform = /obj/item/clothing/under/librarian/pmc + id = /obj/item/card/id/pmc + + backpack_faction = /obj/item/storage/backpack/pmcg + satchel_faction = /obj/item/storage/backpack/satchel/pmcg + dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg + messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg + /datum/outfit/job/visitor/pmc name = "Off-Duty Crew Member - PMC" diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index b030fb2f40e..6026334ffa2 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -61,6 +61,7 @@ "Atmospheric Technician" = /datum/outfit/job/atmos/zavodskoi, "Engineering Apprentice" = /datum/outfit/job/intern_eng/zavodskoi, "Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/zavodskoi, + "Corporate Reporter" = /datum/outfit/job/journalist/zavodskoi, "Corporate Liaison" = /datum/outfit/job/representative/zavodskoi, "Off-Duty Crew Member" = /datum/outfit/job/visitor/zavodskoi ) @@ -252,6 +253,17 @@ /obj/item/stamp/zavodskoi = 1 ) +/datum/outfit/job/journalist/zavodskoi + name = "Corporate Reporter - Zavodskoi Interstellar" + + uniform = /obj/item/clothing/under/librarian/zavod + id = /obj/item/card/id/zavodskoi + + backpack_faction = /obj/item/storage/backpack/zavod + satchel_faction = /obj/item/storage/backpack/satchel/zavod + dufflebag_faction = /obj/item/storage/backpack/duffel/zavod + messengerbag_faction = /obj/item/storage/backpack/messenger/zavod + /datum/outfit/job/visitor/zavodskoi name = "Off-Duty Crew Member - Zavodskoi Interstellar" diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 4863d52eb81..23cec61d256 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -52,6 +52,7 @@ "Xenobotanist" = /datum/outfit/job/scientist/xenobotanist/zeng_hu, "Lab Assistant" = /datum/outfit/job/intern_sci/zeng_hu, "Xenoarchaeologist"= /datum/outfit/job/scientist/xenoarchaeologist/zeng_hu, + "Corporate Reporter" = /datum/outfit/job/journalist/zeng_hu, "Corporate Liaison" = /datum/outfit/job/representative/zeng_hu, "Off-Duty Crew Member" = /datum/outfit/job/visitor/zeng_hu ) @@ -221,6 +222,16 @@ /obj/item/gun/energy/pistol = 1, /obj/item/stamp/zeng_hu = 1 ) +/datum/outfit/job/journalist/zeng_hu + name = "Corporate Reporter - Zeng-Hu" + + uniform = /obj/item/clothing/under/librarian/zeng + id = /obj/item/card/id/zeng_hu + + backpack_faction = /obj/item/storage/backpack/zeng + satchel_faction = /obj/item/storage/backpack/satchel/zeng + dufflebag_faction = /obj/item/storage/backpack/duffel/zeng + messengerbag_faction = /obj/item/storage/backpack/messenger/zeng /datum/outfit/job/visitor/zeng_hu name = "Off-Duty Crew Member - Zeng-Hu" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index c86ed1cd4e7..5c7b8bd253d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -191,74 +191,6 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/job/journalist - title = "Corporate Reporter" - flag = JOURNALIST - departments = SIMPLEDEPT(DEPARTMENT_SERVICE) - department_flag = SERVICE - faction = "Station" - total_positions = 1 - spawn_positions = 1 - supervisors = "the executive officer" - selection_color = "#90524b" - - minimum_character_age = list( - SPECIES_HUMAN = 20, - SPECIES_SKRELL = 50, - SPECIES_SKRELL_AXIORI = 50 - ) - - access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) - alt_titles = list("Freelance Journalist") - alt_outfits = list("Freelance Journalist" = /datum/outfit/job/journalistf) - title_accesses = list("Corporate Reporter" = list(ACCESS_MEDICAL, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ENGINE)) - outfit = /datum/outfit/job/journalist - blacklisted_species = list(SPECIES_VAURCA_BREEDER) - -/datum/outfit/job/journalist - name = "Corporate Reporter" - jobtype = /datum/job/journalist - - uniform = /obj/item/clothing/under/suit_jacket/red - shoes = /obj/item/clothing/shoes/sneakers/black - - tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian - wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian - tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - - backpack_faction = /obj/item/storage/backpack/nt - satchel_faction = /obj/item/storage/backpack/satchel/nt - dufflebag_faction = /obj/item/storage/backpack/duffel/nt - messengerbag_faction = /obj/item/storage/backpack/messenger/nt - - backpack_contents = list( - /obj/item/clothing/accessory/badge/press = 1, - /obj/item/device/tvcamera = 1 - ) - -/datum/outfit/job/journalistf - name = "Freelance Journalist" - jobtype = /datum/job/journalist - - uniform = /obj/item/clothing/under/suit_jacket/red - shoes = /obj/item/clothing/shoes/sneakers/black - - tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian - wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian - tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - - backpack_contents = list( - /obj/item/clothing/accessory/badge/press/independent = 1, - /obj/item/device/tvcamera = 1 - ) - - /datum/job/librarian title = "Librarian" flag = LIBRARIAN diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index 621a4b22596..f3c01695630 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -1,3 +1,70 @@ +/datum/job/journalist + title = "Corporate Reporter" + flag = JOURNALIST + departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN) + department_flag = SERVICE + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "company officials" + selection_color = "#6186cf" + + minimum_character_age = list( + SPECIES_HUMAN = 20, + SPECIES_SKRELL = 50, + SPECIES_SKRELL_AXIORI = 50 + ) + + access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) + alt_titles = list("Freelance Journalist") + alt_outfits = list("Freelance Journalist" = /datum/outfit/job/journalistf) + title_accesses = list("Corporate Reporter" = list(ACCESS_MEDICAL, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ENGINE)) + outfit = /datum/outfit/job/journalist + blacklisted_species = list(SPECIES_VAURCA_BREEDER) + +/datum/outfit/job/journalist + name = "Corporate Reporter" + jobtype = /datum/job/journalist + + uniform = /obj/item/clothing/under/suit_jacket/red + shoes = /obj/item/clothing/shoes/sneakers/black + + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian + tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian + + headset = /obj/item/device/radio/headset/headset_service + bowman = /obj/item/device/radio/headset/headset_service/alt + double_headset = /obj/item/device/radio/headset/alt/double/service + wrist_radio = /obj/item/device/radio/headset/wrist/service + + backpack_faction = /obj/item/storage/backpack/nt + satchel_faction = /obj/item/storage/backpack/satchel/nt + dufflebag_faction = /obj/item/storage/backpack/duffel/nt + messengerbag_faction = /obj/item/storage/backpack/messenger/nt + + backpack_contents = list( + /obj/item/clothing/accessory/badge/press = 1, + /obj/item/device/tvcamera = 1 + ) + +/datum/outfit/job/journalistf + name = "Freelance Journalist" + jobtype = /datum/job/journalist + + uniform = /obj/item/clothing/under/suit_jacket/red + shoes = /obj/item/clothing/shoes/sneakers/black + + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian + tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian + + backpack_contents = list( + /obj/item/clothing/accessory/badge/press/independent = 1, + /obj/item/device/tvcamera = 1 + ) + /datum/job/representative title = "Corporate Liaison" flag = LAWYER diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index bfdf773ab6a..27eeb9f71f9 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -116,7 +116,6 @@ var/list/service_positions = list( "Chef", "Janitor", "Librarian", - "Corporate Reporter", "Chaplain" ) @@ -124,7 +123,8 @@ var/list/civilian_positions = list( "Assistant", "Off-Duty Crew Member", "Passenger", - "Merchant" + "Merchant", + "Corporate Reporter" ) var/list/security_positions = list( diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index b5b6bcd2172..f72917bc519 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -157,6 +157,22 @@ icon_state = "orion_librarian" item_state = "orion_librarian" +/obj/item/clothing/under/librarian/heph + icon_state = "heph_librarian" + item_state = "heph_librarian" + +/obj/item/clothing/under/librarian/pmc + icon_state = "pmc_librarian" + item_state = "pmc_librarian" + +/obj/item/clothing/under/librarian/zavod + icon_state = "zav_librarian" + item_state = "zav_librarian" + +/obj/item/clothing/under/librarian/zeng + icon_state = "zeng_librarian" + item_state = "zeng_librarian" + // Miner /obj/item/clothing/under/rank/miner diff --git a/html/changelogs/greenjoe12345 - reporter.yml b/html/changelogs/greenjoe12345 - reporter.yml new file mode 100644 index 00000000000..7c8c59d9ced --- /dev/null +++ b/html/changelogs/greenjoe12345 - reporter.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy), Greenjoe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Corporate Journalist moved to Civilian. They are now under the jurisdiction of Corporate Officials, and can be selected by every corporation." diff --git a/icons/obj/item/clothing/department_uniforms/service.dmi b/icons/obj/item/clothing/department_uniforms/service.dmi index 1b10d6cf516..e93ce5d4c46 100644 Binary files a/icons/obj/item/clothing/department_uniforms/service.dmi and b/icons/obj/item/clothing/department_uniforms/service.dmi differ