cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardizes fulp edits (+removes a TG edit from mentorhelp) (#357)

Browse Source 
* Automatic changelog compile [ci skip]

* Update readme.md

* Automatic changelog compile [ci skip]

* what

* standardizes fulp edits

* update new modular edit

* Update build.js

* .

* yeah

* Update role_preferences.dm

Co-authored-by: Changelogs <action@github.com>
This commit is contained in:
John Willard
2021-09-20 13:52:04 -04:00
committed by GitHub
parent abd21cbd4c
commit 3d7b22e6b4
26 changed files with 79 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/controllers/subsystem/job.dm
View File

@@ -50,7 +50,15 @@ SUBSYSTEM_DEF(job)
* See [/datum/controller/subsystem/ticker/proc/equip_characters]
*/
var/list/chain_of_command = list(
/*
// Fulp edit START - Jobs
"Captain" = 1,
"Head of Personnel" = 2,
"Head of Security" = 3,
"Research Director" = 4,
"Chief Engineer" = 5,
"Chief Medical Officer" = 6,
"Quartermaster" = 7)
/*
"Captain" = 1,
"Head of Personnel" = 2,
"Research Director" = 3,
@@ -58,15 +66,7 @@ SUBSYSTEM_DEF(job)
"Chief Medical Officer" = 5,
"Head of Security" = 6,
"Quartermaster" = 7)
*/ // FULP EDIT - Chain of Command is different here!
"Captain" = 1,
"Head of Personnel" = 2,
"Head of Security" = 3,
"Research Director" = 4,
"Chief Engineer" = 5,
"Chief Medical Officer" = 6,
"Quartermaster" = 7,
)
*/ // Fulp edit END
/// If TRUE, some player has been assigned Captaincy or Acting Captaincy at some point during the shift and has been given the spare ID safe code.
var/assigned_captain = FALSE
@@ -791,9 +791,9 @@ SUBSYSTEM_DEF(job)
/datum/controller/subsystem/job/proc/setup_job_lists()
station_jobs = list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", \
"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", \
// FULP EDIT - JOBS
// Fulp edit START - Jobs
"Brig Physician", "Deputy", "Supply Deputy", "Engineering Deputy", "Medical Deputy", "Science Deputy", "Service Deputy", \
// FULP EDIT END
// Fulp edit END
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", "Psychologist", \
"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner")

5
code/controllers/subsystem/ticker.dm
View File

@@ -675,8 +675,7 @@ SUBSYSTEM_DEF(ticker)
save_admin_data()
update_everything_flag_in_db()
if(!round_end_sound)
// FULP EDIT - Adds a pointer to the new modular pick_round_end_sound() proc from Fulp's sound.dm
// Original code left in comment
// Fulp edit START - Music
round_end_sound = pick_round_end_sound()
/*
round_end_sound = pick(\
@@ -692,7 +691,7 @@ SUBSYSTEM_DEF(ticker)
'sound/roundend/bully2.ogg'\
)
*/
// FULP EDIT ENDS
// Fulp edit END
///The reference to the end of round sound that we have chosen.
var/sound/end_of_round_sound_ref = sound(round_end_sound)
for(var/mob/M in GLOB.player_list)