Skip to content

Commit

Permalink
Adds a Visiting Officer (Observer) preset (#6330)
Browse files Browse the repository at this point in the history
# About the pull request

Subtype of CO preset, this allows staff to spawn people in as visiting
officers without having to rename things constantly, and reduces
confusion from there being multiple people called Commanding Officer.


# Changelog
:cl:
add: Adds USCM Observer preset, a copy of CO with a different name.
/:cl:
  • Loading branch information
realforest2001 committed Jun 4, 2024
1 parent bd0c245 commit 4829f85
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)

#define JOB_MARINE "USCM Marine" //generic marine
#define JOB_COLONEL "USCM Colonel"
#define JOB_USCM_OBSV "USCM Observer"
#define JOB_GENERAL "USCM General"
#define JOB_ACMC "Assistant Commandant of the Marine Corps"
#define JOB_CMC "Commandant of the Marine Corps"
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/job/special/uscm.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/datum/job/special/uscm/colonel
title = JOB_COLONEL
/datum/job/special/uscm/observer
title = JOB_USCM_OBSV
/datum/job/special/uscm/general
title = JOB_GENERAL
/datum/job/special/uscm/acmc
Expand Down
10 changes: 10 additions & 0 deletions code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,16 @@

//*****************************************************************************************************/

/datum/equipment_preset/uscm_ship/commander/visitor
name = "USCM Observer (Major) (VO)"
flags = EQUIPMENT_PRESET_EXTRA

assignment = JOB_USCM_OBSV
rank = JOB_USCM_OBSV
role_comm_title = "VO"

//*****************************************************************************************************/

/datum/equipment_preset/uscm_ship/commander/council
name = "USCM Commanding Officer (CO+)"
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
Expand Down
Binary file modified icons/mob/hud/marine_hud.dmi
Binary file not shown.
Binary file modified icons/mob/hud/sec_hud.dmi
Binary file not shown.

0 comments on commit 4829f85

Please sign in to comment.