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

MROWL

Browse Source
This commit is contained in:
Unknown
2020-03-09 02:37:25 -04:00
parent 5be57ebb7a
commit d23683c2f0
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+2 -2
View File
@@ -520,8 +520,8 @@
//Exploration (Purple)
counter = 0
jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
jobs += "<tr bgcolor='e79fff'><th colspan='[length(planet_positions)]'><a href='?src=\ref[src];jobban3=explorationdept;jobban4=\ref[M]'>Exploration Positions</a></th></tr><tr align='center'>"
for(var/jobPos in planet_positions)
jobs += "<tr bgcolor='e79fff'><th colspan='[length(SSjob.get_job_titles_in_department(DEPARTMENT_PLANET))]'><a href='?src=\ref[src];jobban3=sciencedept;jobban4=\ref[M]'>Science Positions</a></th></tr><tr align='center'>"
for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_PLANET))
if(!jobPos) continue
var/datum/job/job = job_master.GetJob(jobPos)
if(!job) continue
code/modules/events/supply_demand.dm → code/modules/events/supply_demand_vr.dm
+6 -6
View File
@@ -23,20 +23,20 @@
// Decide what items are requried!
// We base this on what departmets are most active, excluding departments we don't have
var/list/notHaveDeptList = metric.departments.Copy()
notHaveDeptList.Remove(list(ROLE_ENGINEERING, ROLE_MEDICAL, ROLE_RESEARCH, ROLE_CARGO, ROLE_CIVILIAN))
notHaveDeptList.Remove(list(DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_CARGO, DEPARTMENT_CIVILIAN))
var/deptActivity = metric.assess_all_departments(severity * 2, notHaveDeptList)
for(var/dept in deptActivity)
switch(dept)
if(ROLE_ENGINEERING)
if(DEPARTMENT_ENGINEERING)
choose_atmos_items(severity + 1)
if(ROLE_MEDICAL)
if(DEPARTMENT_MEDICAL)
choose_chemistry_items(roll(severity, 2))
if(ROLE_RESEARCH) // Would be nice to differentiate between research diciplines
if(DEPARTMENT_RESEARCH) // Would be nice to differentiate between research diciplines
choose_research_items(roll(severity, 2))
choose_robotics_items(roll(1, severity))
if(ROLE_CARGO)
if(DEPARTMENT_CARGO)
choose_alloy_items(rand(1, severity))
if(ROLE_CIVILIAN) // Would be nice to separate out chef/gardener/bartender
if(DEPARTMENT_CIVILIAN) // Would be nice to separate out chef/gardener/bartender
choose_food_items(roll(severity, 2))
choose_bar_items(roll(severity, 2))
if(required_items.len == 0)