Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPP Logistics Worker and Political Commissar Addition #6920

Merged
merged 6 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
#define JOB_UPP_SPECIALIST "UPP Serzhant"
#define JOB_UPP_LEADER "UPP Master Serzhant"
#define JOB_UPP_POLICE "UPP Politsiya"
#define JOB_UPP_SUPPLY "UPP Logistics Technician"
#define JOB_UPP_LT_OFFICER "UPP Leytenant"
#define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor"
#define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant"
Expand Down Expand Up @@ -291,6 +292,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)

#define JOB_UPP_CREWMAN "UPP Tank Crewman"

#define JOB_UPP_COMMISSAR "UPP Political Commissar"

//-------- CLF --------//
#define JOB_CLF "CLF Guerilla"
#define JOB_CLF_ENGI "CLF Field Technician"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/paygrade_defs/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
/// UO4, Mayjor
#define PAY_SHORT_UO4 "UO4"

/// UO4P, Political Commissar
#define PAY_SHORT_UO4P "UO4P"

/// UO5, Leytenant Kolonel
#define PAY_SHORT_UO5 "UO5"

Expand Down
4 changes: 4 additions & 0 deletions code/datums/factions/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
hud_icon_state = "vc"
if(JOB_UPP_LT_DOKTOR)
hud_icon_state = "doc"
if(JOB_UPP_SUPPLY)
hud_icon_state = "log"
if(JOB_UPP_COMMISSAR)
hud_icon_state = "commi"
if(hud_icon_state)
holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]")

Expand Down
7 changes: 7 additions & 0 deletions code/datums/paygrades/factions/upp/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@
pay_multiplier = 2.5
officer_grade = GRADE_OFFICER

/datum/paygrade/upp/uo4p
paygrade = PAY_SHORT_UO4P
name = "Political Commissar"
prefix = "Pol."
pay_multiplier = 5
officer_grade = GRADE_OFFICER

/datum/paygrade/upp/uo5
paygrade = PAY_SHORT_UO5
name = "Leytenant Kolonel"
Expand Down
28 changes: 28 additions & 0 deletions code/datums/skills/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,34 @@ UNITED PROGRESSIVE PEOPLES
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
)

/datum/skills/upp/logistics_technician
name = "UPP Logistics Technician"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
)

/datum/skills/upp/commissar
name = "UPP Starshy Politruk"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_NOVICE,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
SKILL_INTEL = SKILL_INTEL_EXPERT,
)

/datum/skills/upp/officer
name = "UPP Officer"
skills = list(
Expand Down
2 changes: 2 additions & 0 deletions code/modules/cm_marines/marines_consoles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1115,12 +1115,14 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
JOB_UPP_COMMANDO = 22,
// 30-39: Security
JOB_UPP_POLICE = 31,
JOB_UPP_COMMISSAR = 41,
// 40-49: MedSci
JOB_UPP_LT_DOKTOR = 41,
// 50-59: Engineering
JOB_UPP_COMBAT_SYNTH = 50,
JOB_UPP_CREWMAN = 51,
JOB_UPP_SUPPORT_SYNTH = 52,
JOB_UPP_SUPPLY = 53,
// 60-69: Soldiers
JOB_UPP_LEADER = 60,
JOB_UPP_SPECIALIST = 61,
Expand Down
629 changes: 415 additions & 214 deletions code/modules/gear_presets/upp.dm

Large diffs are not rendered by default.

Binary file modified icons/mob/hud/marine_hud.dmi
Binary file not shown.
Loading