forked from cmss13-devs/cmss13
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Combat Correspondent (cmss13-devs#2761)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> # About the pull request This adds the role combat reporter. This role will be a primarily RP role. The role has an office south of shipside tcomms and west of laundry. For the time being they have the same restrictions as the CL: They may deploy at will. They report directly to the acting commander with regards to ML. They are NOT to be fighting xenos or frontlining. They should be staying in safe areas or moving with escorts (making the area safe). # Explain why it's good for the game This is something that has been asked for quite a bit. I'm on the fence about it personally but was requested to get something running. There is a good argument against "role bloat" which is generally misunderstood as "too many roles bad" which is not the case. Instead, role bloat involves creating extra roles that take away from the gameplay loop or takes away from other roles (specifically in this case the corporate liaison who is rather similar if they want to do a gimmick). Anyways, we'll see how the testmerge goes, feedback, as well as other architect thoughts. Oh and the feedback word today is GIGGLES. # Testing Photographs and Procedure <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <details> <summary>Screenshots & Videos</summary> Tested a bit, we'll run into bugs I'm sure. </details> # Changelog :cl: Morrow add: Added the role Combat Correspondent. /:cl: <!-- Both :cl:'s are required for the changelog to work! --> --------- Co-authored-by: harryob <[email protected]>
- Loading branch information
Showing
34 changed files
with
653 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#define MILITARY_VARIANT "Mil" | ||
#define CIVILIAN_VARIANT "Civ" | ||
|
||
/datum/job/civilian/reporter | ||
title = JOB_COMBAT_REPORTER | ||
total_positions = 1 | ||
spawn_positions = 1 | ||
selection_class = "job_cl" | ||
supervisors = "the acting commanding officer" | ||
gear_preset = /datum/equipment_preset/uscm_ship/reporter | ||
flags_startup_parameters = ROLE_ADD_TO_DEFAULT | ||
selection_class = "job_cl" | ||
|
||
job_options = list(CIVILIAN_VARIANT, MILITARY_VARIANT) | ||
/// If this job is a military variant of the reporter role | ||
var/military = FALSE | ||
|
||
/datum/job/civilian/reporter/handle_job_options(option) | ||
if(option != CIVILIAN_VARIANT) | ||
gear_preset = /datum/equipment_preset/uscm_ship/reporter_uscm | ||
military = TRUE | ||
else | ||
gear_preset = initial(gear_preset) | ||
military = initial(military) | ||
|
||
/datum/job/civilian/reporter/generate_entry_message(mob/living/carbon/human/H) | ||
if(military) | ||
. = {"The USCM has assigned you to the USS Almayer to better handle messaging on how things run in the Neroid Sector. Get out there and show the universe that the USCM is doing great things!"} | ||
else | ||
. = {"What a scoop! You've been assigned to the USS Almayer to see what kinda mischief they'd get into and it seems trouble is here! | ||
This could be the story of the sector! 'Brave Marines responding to dangerous distress signal!' It'd surely get Mr. Parkerson to notice you in the office if you brought him a story like this!"} | ||
|
||
/obj/effect/landmark/start/reporter | ||
name = JOB_COMBAT_REPORTER | ||
job = /datum/job/civilian/reporter | ||
|
||
AddTimelock(/datum/job/civilian/reporter, list( | ||
JOB_HUMAN_ROLES = 10 HOURS, | ||
)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.