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

Merge remote-tracking branch 'refs/remotes/VOREStation/master'

Browse Source
This commit is contained in:
Cameron653
2016-05-23 18:44:30 -04:00
parent 36ef5e381c 38e0c6eb39
commit 3bdb1db7b5
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/misc_vr.dm
+1
View File
@@ -0,0 +1 @@
#define ECO_MODIFIER 10
code/game/jobs/job/job.dm
+1 -1
View File
@@ -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 = ""
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+6
View File
@@ -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")
code/modules/client/preference_setup/loadout/loadout_suit.dm
+3 -3
View File
@@ -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"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -1
View File
@@ -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"
vorestation.dme
+1
View File
@@ -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"