From 2f9561c30e26dab6c91eecc9757ad9acb305af7d Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 23 May 2016 16:14:11 +0100 Subject: [PATCH 1/3] Makes pay equal for everyone --- code/__defines/misc_vr.dm | 1 + code/game/jobs/job/job.dm | 2 +- vorestation.dme | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 code/__defines/misc_vr.dm diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm new file mode 100644 index 0000000000..d459f4a3f0 --- /dev/null +++ b/code/__defines/misc_vr.dm @@ -0,0 +1 @@ +#define ECO_MODIFIER 10 \ No newline at end of file diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 2ae944adfd..b1f6935175 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -53,7 +53,7 @@ if(COMPANY_OPPOSED) loyalty = 0.70 //give them an account in the station database - var/money_amount = (rand(5,50) + rand(5, 50)) * loyalty * economic_modifier * (H.species ? economic_species_modifier[H.species.type] : 2) + var/money_amount = (rand(5,50) + rand(5, 50)) * loyalty * economic_modifier * ECO_MODIFIER var/datum/money_account/M = create_account(H.real_name, money_amount, null) if(H.mind) var/remembered_info = "" diff --git a/vorestation.dme b/vorestation.dme index 488a131a62..73dc9ea16d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -33,6 +33,7 @@ #include "code\__defines\machinery.dm" #include "code\__defines\math_physics.dm" #include "code\__defines\misc.dm" +#include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" #include "code\__defines\research.dm" #include "code\__defines\species_languages.dm" From 0554eac2fc2e957ce93323a50e73567ed507a1fd Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 22 May 2016 14:22:47 +0100 Subject: [PATCH 2/3] Replaces instances of Xenobotanist in loadout with Xenobiologist --- .../modules/client/preference_setup/loadout/loadout_suit.dm | 6 +++--- .../client/preference_setup/loadout/loadout_uniform.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index a86f0e214f..01209c7329 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -143,7 +143,7 @@ /datum/gear/suit/roles/poncho/science display_name = "poncho, science" path = /obj/item/clothing/suit/poncho/roles/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobotanist") + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/suit/roles/poncho/cargo display_name = "poncho, cargo" @@ -218,7 +218,7 @@ /datum/gear/suit/wintercoat/science display_name = "winter coat, science" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobotanist") + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/suit/wintercoat/engineering display_name = "winter coat, engineering" @@ -233,7 +233,7 @@ /datum/gear/suit/wintercoat/hydro display_name = "winter coat, hydroponics" path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro - allowed_roles = list("Botanist", "Xenobotanist") + allowed_roles = list("Botanist", "Xenobiologist") /datum/gear/suit/wintercoat/cargo display_name = "winter coat, cargo" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 1ef69de38a..5e368bfb81 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -131,7 +131,7 @@ /datum/gear/uniform/skirt/sci display_name = "skirt, scientist" path = /obj/item/clothing/under/rank/scientist/skirt - allowed_roles = list("Research Director","Scientist") + allowed_roles = list("Research Director","Scientist", "Xenobiologist") /datum/gear/uniform/skirt/cargo display_name = "skirt, cargo" From eaf0e1e4dd47ac9b2c4c91450dbb3c7d235dfc85 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Mon, 23 May 2016 16:30:05 +0100 Subject: [PATCH 3/3] Fixes #175 --- .../preference_setup/loadout/loadout_accessories_vr.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 769d04b982..19d640fe56 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -25,3 +25,9 @@ /datum/gear/collar/pink display_name = "Collar, Pink" path = /obj/item/clothing/accessory/collar/pink + +/datum/gear/accessory/white_drop_pouches + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") + +/datum/gear/accessory/white_vest + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") \ No newline at end of file