Skip to content

Commit

Permalink
CLF
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Dec 1, 2023
1 parent 9d78d14 commit 0a92ee5
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
5 changes: 5 additions & 0 deletions code/__DEFINES/paygrade_defs/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@
/// CSPO, Senior Officer
#define PAY_SHORT_CSPO "CSPO"

/// REB, Rebel
#define PAY_SHORT_REB "REB"

/// REBC, Rebel Commander "REBC"
#define PAY_SHORT_REBC "REBC"
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,12 @@
name = "Senior Officer"
prefix = "Sr. Off."
pay_multiplier = 0.8

/datum/paygrade/civilian/rebel
paygrade = PAY_SHORT_REB
name = "Rebel"

/datum/paygrade/civilian/rebel/leader
paygrade = PAY_SHORT_REBC
name = "Rebel Commander"
prefix = "CMDR."
4 changes: 2 additions & 2 deletions code/modules/gear_presets/clf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
languages = list(LANGUAGE_JAPANESE, LANGUAGE_ENGLISH)
assignment = JOB_CLF
rank = FACTION_CLF
paygrade = PAY_SHORT_CIV
paygrade = PAY_SHORT_REB
faction = FACTION_CLF
origin_override = ORIGIN_CIVILIAN
idtype = /obj/item/card/id/data
Expand Down Expand Up @@ -900,7 +900,7 @@
flags = EQUIPMENT_PRESET_EXTRA
assignment = JOB_CLF_COMMANDER
rank = JOB_CLF_COMMANDER
paygrade = PAY_SHORT_NO5
paygrade = PAY_SHORT_REBC
role_comm_title = "CMDR"
skills = /datum/skills/clf/commander

Expand Down
2 changes: 1 addition & 1 deletion colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
#include "code\datums\pain\pain_zombie.dm"
#include "code\datums\paygrades\helper.dm"
#include "code\datums\paygrades\paygrade.dm"
#include "code\datums\paygrades\factions\civillian\civilian.dm"
#include "code\datums\paygrades\factions\other\civilian.dm"
#include "code\datums\paygrades\factions\other\cmb.dm"
#include "code\datums\paygrades\factions\other\contractors.dm"
#include "code\datums\paygrades\factions\other\dutch_dozen.dm"
Expand Down

0 comments on commit 0a92ee5

Please sign in to comment.