cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expeditionary corps + Black Mesa + Trusted Player System (#5418)

Browse Source 
* OH YEAH BOIS BRING THE SALT

* AAAAAA

* AAAAAAAA

* Update tgstation.dme

* AAA

* Update uniform_digi.dmi

* AAAAA

* Update trusted_players.txt

* \ADSA

* AAA

* Update expeditionary_corps.dm

* AAAA

* Update expeditionary_corps.dm

* Update jobmanagement.dm

* Update expeditionary_corps.dm

* AAA

* AA

* Update wildwest.dmm

* AAAAAAAAA

* Update wildwest.dmm

* AAAAAA

* Update clothing.dm

* AAAA

* AAA

* AA

* AA

* AAA

* Merge branch 'master' into exp-corps

* Update _basemap.dm

* Update map_template.dm

* AAAAAAAA

* AAAAAAAA

* fc

* AAA

* Update faithless.dm

* Update faithless.dm

* Update wildwest_skyrat.dmm

* CHANGES EXP TROOPER TO SCIENCE

* OH YEAH

* AAA

* AAA

* Update jobs.dm

* AAA

* AAAAAAAAAAAAAAAAAA

* Update modular_skyrat/modules/exp_corps/code/clothing.dm

Co-authored-by: Tom <tomforde4@gmail.com>

* stupid action button

* aaa

* Merge branch 'exp-corps' of https://github.com/Skyrat-SS13/Skyrat-tg into exp-corps

* Merge branch 'master' into exp-corps

* a

* AAAAAAAAA

* Update sector_c.dm

* WOAH THATS A LOT OF FILES

* AAAAAAAA

* Update black_mesa.dm

* Update black_mesa.dm

* AAAA

* aaaaaa

* Update black_mesa.dm

* a

* 00

* a

* Update black_mesa.dm

* HEDCRABS

* fffff

* aaa

* 000

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* F

* aaa

* NO MORE GOD OPS!

* Update blackmesa.dmm

* 0

* AAAAA

* Update black_mesa.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update expeditionary_trooper.dm

* Update black_mesa.dm

* Update black_mesa.dm

* a

* a

* a

* a

* Update uniform_digi.dmi

* no raping ears

* Update uniform.dmi

* Update hev_suit.dm

* Update black_mesa.dm

* a

* a

* a

* Update blackmesa.dmm

* Update blackmesa.dmm

* AAA

* Update black_mesa.dm

* Update blackmesa.dmm

* A

* a

* Update job.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update black_mesa.dm

* Update biohazard_blob_mobs.dm

* a

* Update mold_event.dm

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
Co-authored-by: Tom <tomforde4@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
Gandalf
2021-05-23 17:00:39 +02:00
committed by GitHub
co-authored by Tom Useroth Funce
parent a5298a03b7
commit 5f10f39257
414 changed files with 140138 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/jobmanagement.dm
+4 -4
View File
@@ -24,10 +24,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
"Head of Security",
"Chief Engineer",
"Research Director",
"Security Sergeant",
"Security Sergeant", //SKYRAT EDIT CHANGE START
"Security Medic",
"Clown",
"Blueshield",
"Blueshield", //SKYRAT EDIT END
"Chief Medical Officer",
"Quartermaster",
"Shuttle Pilot")
@@ -44,7 +44,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay)
/datum/computer_file/program/job_management/proc/can_open_job(datum/job/job)
if(!(job?.title in blacklisted))
if(!(job?.title in blacklisted) && !job?.trusted_only) //SKRYAT EDIT CHANGE
if((job.total_positions <= length(GLOB.player_list) * (max_relative_positions / 100)))
var/delta = (world.time / 10) - GLOB.time_last_changed_position
if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
@@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
return FALSE
/datum/computer_file/program/job_management/proc/can_close_job(datum/job/job)
if(!(job?.title in blacklisted))
if(!(job?.title in blacklisted) && !job?.trusted_only) //SKRYAT EDIT CHANGE
if(job.total_positions > length(GLOB.player_list) * (max_relative_positions / 100))
var/delta = (world.time / 10) - GLOB.time_last_changed_position
if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))