cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14503 from Very-Soft/broke

Browse Source 
Broke
This commit is contained in:
Casey
2023-02-17 17:00:51 +00:00
committed by CHOMPStation2
parent ddedbf2a8c
commit 2071da1bf1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/mobs.dm
+2 -1
View File
@@ -136,8 +136,9 @@
#define CLASS_MIDDLE "Average"
#define CLASS_LOWMID "Underpaid"
#define CLASS_LOWER "Poor"
#define CLASS_BROKE "Broke" //VOREStation Add
#define ECONOMIC_CLASS list(CLASS_UPPER,CLASS_UPMID,CLASS_MIDDLE,CLASS_LOWMID,CLASS_LOWER)
#define ECONOMIC_CLASS list(CLASS_UPPER,CLASS_UPMID,CLASS_MIDDLE,CLASS_LOWMID,CLASS_LOWER,CLASS_BROKE)
// Defines mob sizes, used by lockers and to determine what is considered a small sized mob, etc.
code/game/jobs/job/job.dm
+2 -1
View File
@@ -70,6 +70,7 @@
if(CLASS_MIDDLE) income = 1
if(CLASS_LOWMID) income = 0.75
if(CLASS_LOWER) income = 0.50
if(CLASS_BROKE) income = 0 //VOREStation Add - Rent's not cheap
//give them an account in the station database
var/money_amount = (rand(15,40) + rand(15,40)) * income * economic_modifier * ECO_MODIFIER //VOREStation Edit - Smoothed peaks, ECO_MODIFIER rather than per-species ones.
@@ -186,4 +187,4 @@
return TRUE
if(brain_type in banned_job_species)
return TRUE
*/
*/