-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
…dmin_console
- Loading branch information
Showing
73 changed files
with
16,467 additions
and
15,957 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// Paygrade shorthand defines, to allow clearer designation. | ||
|
||
// MERCENARIES | ||
/// FL-S, Standard | ||
#define PAY_SHORT_FL_S "FL-S" | ||
|
||
/// FL-M, Medic | ||
#define PAY_SHORT_FL_M "FL-M" | ||
|
||
/// FL-WL, Warlord | ||
#define PAY_SHORT_FL_WL "FL-WL" | ||
|
||
/// EFL-S, Elite Standard | ||
#define PAY_SHORT_EFL_S "EFL-S" | ||
|
||
/// EFL-M, Elite Medic | ||
#define PAY_SHORT_EFL_M "EFL-M" | ||
|
||
/// EFL-E, Elite Engineer | ||
#define PAY_SHORT_EFL_E "EFL-E" | ||
|
||
/// EFL-H, Elite Heavy | ||
#define PAY_SHORT_EFL_H "EFL-H" | ||
|
||
/// EFL-WL, Elite Warlord | ||
#define PAY_SHORT_EFL_TL "EFL-TL" | ||
|
||
// VANGUARD'S ARROW INC | ||
/// VAI-S, Standard | ||
#define PAY_SHORT_VAI_S "VAI-S" | ||
|
||
/// VAI-M, Medic | ||
#define PAY_SHORT_VAI_M "VAI-M" | ||
|
||
/// VAI-E, Engineer | ||
#define PAY_SHORT_VAI_E "VAI-E" | ||
|
||
/// VAI-G, Machinegunner | ||
#define PAY_SHORT_VAI_G "VAI-G" | ||
|
||
/// VAI-SN, Synthetic | ||
#define PAY_SHORT_VAI_SN "VAI-SN" | ||
|
||
/// VAI-L, Team Leader | ||
#define PAY_SHORT_VAI_L "VAI-L" |
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,6 @@ | ||
/// Paygrade is equivalent to or is an enlisted position. | ||
#define GRADE_ENLISTED 0 | ||
/// Paygrade is equivalent to or is an officer. | ||
#define GRADE_OFFICER 1 | ||
/// Paygrade is for high command or senior leadership. Military flag officers. | ||
#define GRADE_FLAG 2 |
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,38 @@ | ||
// Paygrade shorthand defines, to allow clearer designation. | ||
|
||
// THREE WORLD EMPIRE | ||
/// RMC1, Heitai-Marine | ||
#define PAY_SHORT_RMC1 "RMC1" | ||
|
||
/// RMC2, Santo-Lance Corporal | ||
#define PAY_SHORT_RMC2 "RMC2" | ||
|
||
/// RMC3, Nito-Corporal | ||
#define PAY_SHORT_RMC3 "RMC3" | ||
|
||
/// RMC4, Itto-Sergeant | ||
#define PAY_SHORT_RMC4 "RMC4" | ||
|
||
/// RNOW, Warrant Officer | ||
#define PAY_SHORT_RNOW "RNOW" | ||
|
||
/// RNO1, Second Lieutenant | ||
#define PAY_SHORT_RNO1 "RNO1" | ||
|
||
/// RNO2, First Lieutenant | ||
#define PAY_SHORT_RNO2 "RNO2" | ||
|
||
/// RNO3, Standing Officer | ||
#define PAY_SHORT_RNO3 "RNO3" | ||
|
||
/// RNO4, Captain | ||
#define PAY_SHORT_RNO4 "RNO4" | ||
|
||
/// RNO5, Admiral | ||
#define PAY_SHORT_RNO5 "RNO5" | ||
|
||
/// RNO6, Grand Admiral | ||
#define PAY_SHORT_RNO6 "RNO6" | ||
|
||
/// EMP, Emperor | ||
#define PAY_SHORT_EMP "EMP" |
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 |
---|---|---|
@@ -1,38 +1,39 @@ | ||
/datum/paygrade/contractors | ||
name = "Contractor Paygrade" | ||
fprefix = "VAI" | ||
pay_multiplier = 1.5 | ||
|
||
/datum/paygrade/contractors/standard | ||
paygrade = "VAI" | ||
paygrade = PAY_SHORT_VAI_S | ||
name = "VAI Mercenary" | ||
prefix = "VAI" | ||
prefix = "Merc." | ||
|
||
/datum/paygrade/contractors/med | ||
paygrade = "VAI-M" | ||
paygrade = PAY_SHORT_VAI_M | ||
name = "VAI Medical Specialist" | ||
prefix = "VAI MED" | ||
prefix = "Med." | ||
pay_multiplier = 1.75 | ||
|
||
/datum/paygrade/contractors/mg | ||
paygrade = "VAI-G" | ||
paygrade = PAY_SHORT_VAI_G | ||
name = "VAI Machinegunner" | ||
prefix = "VAI MG" | ||
prefix = "MG." | ||
pay_multiplier = 1.75 | ||
|
||
/datum/paygrade/contractors/engi | ||
paygrade = "VAI-E" | ||
paygrade = PAY_SHORT_VAI_E | ||
name = "VAI Engineering Specialist" | ||
prefix = "VAI ENG" | ||
prefix = "Eng." | ||
pay_multiplier = 1.75 | ||
|
||
/datum/paygrade/contractors/syn | ||
paygrade = "VAI-S" | ||
paygrade = PAY_SHORT_VAI_SN | ||
name = "VAI Synthetic" | ||
prefix = "VAI Syn" | ||
pay_multiplier = 0 | ||
|
||
/datum/paygrade/contractors/lead | ||
paygrade = "VAI-L" | ||
paygrade = PAY_SHORT_VAI_L | ||
name = "VAI Team Leader" | ||
prefix = "VAI TL" | ||
prefix = "TL." | ||
pay_multiplier = 2.25 | ||
officer_grade = GRADE_OFFICER |
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 |
---|---|---|
|
@@ -30,4 +30,5 @@ | |
name = "Major" | ||
prefix = "LDR." | ||
pay_multiplier = 9 | ||
officer_grade = GRADE_OFFICER | ||
|
Oops, something went wrong.