cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 14:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney

Browse Source 
Economic strength now depends on race and job.
This commit is contained in:
Chinsky
2015-08-14 03:56:57 +03:00
parent 8c9d36e24a c63f4c62b5
commit 54cb084113
16 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -1401,7 +1401,7 @@ datum/preferences
backbag = backbaglist.Find(new_backbag)
if("nt_relation")
var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference") as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference") as null|anything in COMPANY_ALIGNMENTS
if(new_relation)
nanotrasen_relation = new_relation
code/modules/economy/economy_misc.dm
+9
View File
@@ -46,6 +46,15 @@
#define GEAR_EVA 15
/var/list/economic_species_modifier = list(
/datum/species/human = 10,
/datum/species/skrell = 12,
/datum/species/tajaran = 7,
/datum/species/unathi = 7,
/datum/species/vox = 1
)
//---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
//Corporation NanoTrasen - Generalised / high tech research and phoron exploitation.
//Corporation Vessel Contracting - Ship and station construction, materials research.