Skip to content

Commit

Permalink
Money Rework (cmss13-devs#1831)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request

Added a variable to paygrades called pay_multiplier. This multiplies the
starting amount of money from bank accounts.

Refactored how bank accounts are created so the above could work.

Drastically nuked the amount of money people start with. People can no
longer start with thousands of dollars.... they now get 30-50. This
value is multiplied by the pay_multiplier below.

Added pay_multiplier to all paygrades. The higher your rank, the more
money you'll start with, based on this multiplier. (For example, a Major
will have a pay multiplier of 4.) Includes strange roles like VAIPO,
UPP, PMCs, RESS...

Non-binary WY executives may now spawn with 'Mx.' as their
communications prefix.

Altered the prices of cigarette vending machines around to overall make
them more expensive. PFCs will not be able to buy Executive Select with
their starting cash.

Made cassetes and Souto from vendors more expensive. Buying food from
Hot Foods now costs money. Marine coffee now has an appropiate
description. Souto vendors no longer vend water bottles.

Fixed default parent type dollar items being worth 0 money...

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

> Drastically nuked the amount of money people start with. People can no
longer start with thousands of dollars.... they now get 30-50. This
value is multiplied by the pay_multiplier below.

Lore. The live of a private sucks. Monkeysfist suggested this value.
Still enough to buy all essentials, scavenge some money if you want to
buy the good cigarette packs down in the colony.

> Added pay_multiplier to all paygrades. The higher your rank, the more
money you'll start with, based on this multiplier. (For example, a Major
will have a pay multiplier of 4.) Includes strange roles like VAIPO,
UPP, PMCs, RESS...

Why were paygrades added without affecting pay. Why could PFCs start
with 3 thousand dollars and COs with 50 dollars total.

> Non-binary WY executives may now spawn with 'Mx.' as their
communications prefix.

Inclusivity win! Doesn't actually do anything as we do not have
nonbinary characters.

> Altered the prices of cigarette vending machines around to overall
make them more expensive. PFCs will not be able to buy Executive Select
with their starting cash.

> Made cassetes and Souto from vendors more expensive. Buying food from
Hot Foods now costs money. Marine coffee now has an appropiate
description. Souto vendors no longer vend water bottles.

It's funny to make the lives of marines miserable.

> Fixed default parent type dollar items being worth 0 money...

This will let marines money scrounge.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->


# 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>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

Irrelevant.

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Be sure to properly mark your PRs to prevent unnecessary
GBP loss. Maintainers freely reserve the right to remove and add tags
should they deem it appropriate. -->

:cl:
add: Added pay_multiplier to all paygrades. The higher your rank, the
more money you'll start with, based on this multiplier. (For example, a
Major will have a pay multiplier of 4.) Includes strange roles like
VAIPO, UPP, PMCs, RESS...
del: Drastically nuked the amount of money people start with. People can
no longer start with thousands of dollars.... they now get 30-50 dollars
total. This value is multiplied by the pay_multiplier above.
spellcheck: Non-binary WY executives may now spawn with 'Mx.' as their
communications prefix.
balance: Altered the prices of cigarette vending machines around to
overall make them more expensive. PFCs will not be able to buy Executive
Select with their starting cash.
del: Made cassetes and Souto from vendors more expensive. Buying food
from Hot Foods now costs money. Marine coffee now has an appropiate
description. Souto vendors no longer vend water bottles.
fix: Fixed default parent type dollar items being worth 0 money...
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
  • Loading branch information
carlarctg authored Dec 7, 2022
1 parent 447b513 commit c8f4d4a
Show file tree
Hide file tree
Showing 21 changed files with 221 additions and 115 deletions.
28 changes: 16 additions & 12 deletions code/datums/paygrades/factions/civillian/civilian.dm
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
/datum/paygrade/civilian
name = "Civilian Paygrade"
name = "Civilian Paygrade"
pay_multiplier = 0.5 // civvies are poor

/datum/paygrade/civilian/civilian
paygrade = "C"
name = "Civilian"
paygrade = "C"
name = "Civilian"

/datum/paygrade/civilian/nurse
paygrade = "CN"
name = "Nurse"
prefix = "Nrs."
paygrade = "CN"
name = "Nurse"
prefix = "Nrs."

/datum/paygrade/civilian/doctor
paygrade = "CD"
name = "Doctor"
prefix = "Dr."
paygrade = "CD"
name = "Doctor"
prefix = "Dr."
pay_multiplier = 0.75

/datum/paygrade/civilian/professor
paygrade = "CCMO"
name = "Professor"
prefix = "Prof."
paygrade = "CCMO"
name = "Professor"
prefix = "Prof."
pay_multiplier = 1

/datum/paygrade/civillian/representative
paygrade = "CR"
name = "Representative"
prefix = "Rep."
pay_multiplier = 1
6 changes: 6 additions & 0 deletions code/datums/paygrades/factions/other/contractors.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/datum/paygrade/contractors
name = "Contractor Paygrade"
pay_multiplier = 1.5

/datum/paygrade/contractors/standard
paygrade = "VAI"
Expand All @@ -10,23 +11,28 @@
paygrade = "VAI-M"
name = "VAI Medical Specialist"
prefix = "VAI MED"
pay_multiplier = 1.75

/datum/paygrade/contractors/mg
paygrade = "VAI-G"
name = "VAI Machinegunner"
prefix = "VAI MG"
pay_multiplier = 1.75

/datum/paygrade/contractors/engi
paygrade = "VAI-E"
name = "VAI Engineering Specialist"
prefix = "VAI ENG"
pay_multiplier = 1.75

/datum/paygrade/contractors/syn
paygrade = "VAI-S"
name = "VAI Synthetic"
prefix = "VAI SYN"
pay_multiplier = 0

/datum/paygrade/contractors/lead
paygrade = "VAI-L"
name = "VAI Team Leader"
prefix = "VAI TL"
pay_multiplier = 2.25
6 changes: 6 additions & 0 deletions code/datums/paygrades/factions/other/dutch_dozen.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/datum/paygrade/dutch
name = "Dutch Paygrade"
pay_multiplier = 5

/datum/paygrade/dutch/standard
paygrade = "DTC"
Expand All @@ -10,18 +11,23 @@
paygrade = "DTCM"
name = "Dutch's Dozen Medic"
prefix = "DTC MED."
pay_multiplier = 6

/datum/paygrade/dutch/specialist_flamer
paygrade = "DTCF"
name = "Dutch's Dozen Flamethrower Specialist"
prefix = "DTC SPC."
pay_multiplier = 6

/datum/paygrade/dutch/specialist_minigunner
paygrade = "DTCMG"
name = "Dutch's Dozen Medic"
prefix = "DTC SPC."
pay_multiplier = 6

/datum/paygrade/dutch/arnold
paygrade = "ARN"
name = "Arnold"
prefix = "DTC LDR."
pay_multiplier = 9

4 changes: 4 additions & 0 deletions code/datums/paygrades/factions/other/freelancer.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/datum/paygrade/freelancer
name = "Freelancer Paygrade"
pay_multiplier = 0.75 //these are shitty mercs.

/datum/paygrade/freelancer/standard
paygrade = "Freelancer Standard"
Expand All @@ -15,9 +16,11 @@
paygrade = "Freelancer Leader"
name = "Freelancer Leader"
prefix = "Warlord"
pay_multiplier = 1

/datum/paygrade/freelancer/elite
name = "Elite Freelancer Paygrade"
pay_multiplier = 1.25

/datum/paygrade/freelancer/elite/standard
paygrade = "Elite Freelancer Standard"
Expand All @@ -43,3 +46,4 @@
paygrade = "Elite Freelancer Leader"
name = "Elite Freelancer Leader"
prefix = "Warlord"
pay_multiplier = 1.5
1 change: 1 addition & 0 deletions code/datums/paygrades/factions/other/misc.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/datum/paygrade/misc/operator
name = "Operative"
paygrade = "O"
pay_multiplier = 1 //????
15 changes: 13 additions & 2 deletions code/datums/paygrades/factions/ress/ress.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/paygrade/ress
name = "RESS Paygrade"

name = "RESS Paygrade"
pay_multiplier = 2 // less people = more to pay them

//RESS RMC
/datum/paygrade/ress/rc1
Expand All @@ -12,55 +12,66 @@
paygrade = "RC2"
name = "Santo"
prefix = "St."
pay_multiplier = 2.1

/datum/paygrade/ress/rc3
paygrade = "RC3"
name = "Nito"
prefix = "Nt."
pay_multiplier = 2.2

/datum/paygrade/ress/rc4
paygrade = "RC4"
name = "Itto"
prefix = "It."
pay_multiplier = 2.3


//RESS Naval Officers
/datum/paygrade/ress/ro1
paygrade = "RO1"
name = "Seaman"
prefix = "SN."
pay_multiplier = 3

/datum/paygrade/ress/ro2
paygrade = "RO2"
name = "Leading Seaman"
prefix = "LR."
pay_multiplier = 3.25

/datum/paygrade/ress/ro3
paygrade = "RO3"
name = "Standing Officer"
prefix = "SO."
pay_multiplier = 3.5

/datum/paygrade/ress/ro3e
paygrade = "RO3E"
name = "Warrant Officer"
prefix = "WO."
pay_multiplier = 3.5

/datum/paygrade/ress/ro4
paygrade = "RO4"
name = "Captain"
prefix = "Cpt."
pay_multiplier = 5

/datum/paygrade/ress/ro5
paygrade = "RO5"
name = "Admiral"
prefix = "ADM."
pay_multiplier = 7

/datum/paygrade/ress/ro6
paygrade = "RO6"
name = "Grand Admiral"
prefix = "GADM."
pay_multiplier = 9

/datum/paygrade/ress/ro7
paygrade = "RO7"
name = "Emperor"
prefix = "ER."
pay_multiplier = 1000
22 changes: 21 additions & 1 deletion code/datums/paygrades/factions/upp/upp.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/datum/paygrade/upp
name = "UPP Paygrade"
name = "UPP Paygrade"
pay_multiplier = 0.1 //lol. lmao


//UPP Enlisted
/datum/paygrade/upp/ue0
paygrade = "UE0"
name = "Conscript"
pay_multiplier = 0.05

/datum/paygrade/upp/ue1
paygrade = "UE1"
Expand All @@ -21,90 +23,108 @@
paygrade = "UE3M"
name = "Korporal Medic"
prefix = "Kpl."
pay_multiplier = 0.3

/datum/paygrade/upp/ue3s
paygrade = "UE3S"
name = "Korporal Sapper"
prefix = "Kpl."
pay_multiplier = 0.3

/datum/paygrade/upp/ue4
paygrade = "UE4"
name = "Junior Serzhant"
prefix = "JrSzh."
pay_multiplier = 0.5

/datum/paygrade/upp/ue5
paygrade = "UE5"
name = "Serzhant"
prefix = "Szh."
pay_multiplier = 0.7

/datum/paygrade/upp/ue6
paygrade = "UE6"
name = "Master Serzhant"
prefix = "MSzh."
pay_multiplier = 0.9

//UPP Commandos
/datum/paygrade/upp/uc1
paygrade = "UC1"
name = "Junior Kommando"
prefix = "JKdo."
pay_multiplier = 1.5

/datum/paygrade/upp/uc2
paygrade = "UC2"
name = "2nd Kommando"
prefix = "2ndKdo."
pay_multiplier = 2

/datum/paygrade/upp/uc3
paygrade = "UC3"
name = "1st Kommando"
prefix = "1stKdo."
pay_multiplier = 2.5

//UPP Officers
/datum/paygrade/upp/uo1
paygrade = "UO1"
name = "Leytenant"
prefix = "Lt."
pay_multiplier = 1.25

/datum/paygrade/upp/uo1m
paygrade = "UO1M"
name = "Leytenant Medic"
prefix = "Lt. Med."
pay_multiplier = 1.25

/datum/paygrade/upp/uo1e
paygrade = "UO1E"
name = "Senior Leytenant"
prefix = "Sr. LT."
pay_multiplier = 1.5


/datum/paygrade/upp/uo2
paygrade = "UO2"
name = "Kapitan"
prefix = "Kpt."
pay_multiplier = 2

/datum/paygrade/upp/uo3
paygrade = "UO3"
name = "Mayjor."
prefix = "May."
pay_multiplier = 2.5

/datum/paygrade/upp/uo4
paygrade = "UO4"
name = "Leytenant Kolonel"
pay_multiplier = 3

/datum/paygrade/upp/uo5
paygrade = "UO5"
name = "Kolonel"
prefix = "Kol."
pay_multiplier = 4

/datum/paygrade/upp/uo6
paygrade = "UO6"
name = "Mayjor General"
prefix = "MayGen."
pay_multiplier = 5

/datum/paygrade/upp/uo7
paygrade = "UO7"
name = "Leytenant General"
prefix = "LtGen."
pay_multiplier = 6

/datum/paygrade/upp/uo8
paygrade = "UO8"
name = "Army General"
prefix = "ArmGen."
pay_multiplier = 7
Loading

0 comments on commit c8f4d4a

Please sign in to comment.