cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces all references to a 'civilian' department with 'service'. Also fixes operations colour on the late join menu.

Browse Source
This commit is contained in:
mikomyazaki
2022-04-07 19:02:02 +01:00
parent 835979172e
commit 9f9ac45230
17 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__defines/subsystem-defines.dm
View File

@@ -115,7 +115,7 @@
#define DEPARTMENT_MEDICAL "Medical"
#define DEPARTMENT_SCIENCE "Science"
#define DEPARTMENT_CARGO "Operations"
#define DEPARTMENT_CIVILIAN "Civilian"
#define DEPARTMENT_SERVICE "Service"
#define DEPARTMENT_EQUIPMENT "Equipment"
#define DEPARTMENT_MISCELLANEOUS "Miscellaneous"
#define DEPARTMENTS_LIST_INIT list(\
@@ -125,7 +125,7 @@
DEPARTMENT_MEDICAL = list(),\
DEPARTMENT_SCIENCE = list(),\
DEPARTMENT_CARGO = list(),\
DEPARTMENT_CIVILIAN = list(),\
DEPARTMENT_SERVICE = list(),\
DEPARTMENT_EQUIPMENT = list(),\
DEPARTMENT_MISCELLANEOUS = list(),\
)

6
code/game/jobs/job/captain.dm
View File

@@ -76,8 +76,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
/datum/job/xo
title = "Executive Officer"
flag = XO
departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR, DEPARTMENT_COMMAND)
department_flag = CIVILIAN
departments = list(DEPARTMENT_SERVICE = JOBROLE_SUPERVISOR, DEPARTMENT_COMMAND)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -130,7 +130,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
/datum/job/bridge_crew
title = "Bridge Crew"
flag = BRIDGE_CREW
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = ENGSEC
faction = "Station"
total_positions = 3

32
code/game/jobs/job/civilian.dm
View File

@@ -1,8 +1,8 @@
/datum/job/bartender
title = "Bartender"
flag = BARTENDER
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 2
spawn_positions = 2
@@ -39,8 +39,8 @@
/datum/job/chef
title = "Chef"
flag = CHEF
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 2
spawn_positions = 2
@@ -79,8 +79,8 @@
/datum/job/hydro
title = "Gardener"
flag = BOTANIST
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 2
spawn_positions = 2
@@ -131,8 +131,8 @@
/datum/job/janitor
title = "Janitor"
flag = JANITOR
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 2
spawn_positions = 2
@@ -164,8 +164,8 @@
/datum/job/journalist
title = "Corporate Reporter"
flag = JOURNALIST
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -221,8 +221,8 @@
/datum/job/librarian
title = "Librarian"
flag = LIBRARIAN
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -277,8 +277,8 @@
/datum/job/chaplain
title = "Chaplain"
flag = CHAPLAIN
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -382,7 +382,7 @@
title = "Hangar Technician"
flag = CARGOTECH
departments = SIMPLEDEPT(DEPARTMENT_CARGO)
department_flag = CIVILIAN
department_flag = SERVICE
faction = "Station"
total_positions = 3
spawn_positions = 3
@@ -419,7 +419,7 @@
title = "Shaft Miner"
flag = MINER
departments = SIMPLEDEPT(DEPARTMENT_CARGO)
department_flag = CIVILIAN
department_flag = SERVICE
faction = "Station"
total_positions = 3
spawn_positions = 3

2
code/game/jobs/job/outsider/merchant.dm
View File

@@ -2,7 +2,7 @@
title = "Merchant"
faction = "Station"
flag = MERCHANT
department_flag = CIVILIAN
department_flag = SERVICE
total_positions = 0
spawn_positions = 0
supervisors = "yourself and the market"

8
code/game/jobs/job/outsider/representative.dm
View File

@@ -1,8 +1,8 @@
/datum/job/representative
title = "Corporate Liaison"
flag = LAWYER
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -85,8 +85,8 @@
/datum/job/consular
title = "Consular Officer"
flag = CONSULAR
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = 1
spawn_positions = 1

12
code/game/jobs/job/ship_crew.dm
View File

@@ -1,8 +1,8 @@
/datum/job/assistant
title = "Assistant"
flag = ASSISTANT
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = -1
spawn_positions = -1
@@ -31,8 +31,8 @@
/datum/job/visitor
title = "Off-Duty Crew Member"
flag = VISITOR
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = -1
spawn_positions = -1
@@ -54,8 +54,8 @@
/datum/job/passenger
title = "Passenger"
flag = PASSENGER
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
departments = SIMPLEDEPT(DEPARTMENT_SERVICE)
department_flag = SERVICE
faction = "Station"
total_positions = -1
spawn_positions = -1

6
code/game/jobs/jobs.dm
View File

@@ -1,4 +1,4 @@
var/const/NUM_JOB_DEPTS = 3 //ENGSEC, MEDSCI and CIVILIAN
var/const/NUM_JOB_DEPTS = 3 //ENGSEC, MEDSCI and SERVICE
var/const/ENGSEC =(1<<0)
var/const/CAPTAIN =(1<<0)
@@ -33,7 +33,7 @@ var/const/INTERN_MED =(1<<11)
var/const/INTERN_SCI =(1<<12)
var/const/CIVILIAN =(1<<2)
var/const/SERVICE =(1<<2)
var/const/XO =(1<<0)
var/const/BARTENDER =(1<<1)
@@ -98,7 +98,7 @@ var/list/cargo_positions = list(
"Machinist"
)
var/list/civilian_positions = list(
var/list/service_positions = list(
"Corporate Liaison",
"Consular Officer",
"Bartender",

4
code/global.dm
View File

@@ -153,9 +153,9 @@ var/list/department_funds = list(
"Science" = 10000,
"Security" = 10000,
"Operations" = 5000,
"Civilian" = 10000,
"Service" = 10000,
"Vendor" = 0
)
//List of exosuit tracking beacons, to save performance
var/global/list/exo_beacons = list()
var/global/list/exo_beacons = list()

6
code/modules/admin/banjob.dm
View File

@@ -458,8 +458,8 @@ var/list/jobban_keylist = list() // Global jobban list.
//Civilian (Grey)
counter = 0
jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
jobs += "<tr bgcolor='dddddd'><th colspan='[length(civilian_positions)]'><a href='?src=\ref[src];jobban_job=civiliandept;jobban_tgt=[ckey]'>Civilian Positions</a></th></tr><tr align='center'>"
for (var/jobPos in civilian_positions)
jobs += "<tr bgcolor='dddddd'><th colspan='[length(service_positions)]'><a href='?src=\ref[src];jobban_job=civiliandept;jobban_tgt=[ckey]'>Civilian Positions</a></th></tr><tr align='center'>"
for (var/jobPos in service_positions)
if (!jobPos)
continue
var/datum/job/job = SSjobs.GetJob(jobPos)
@@ -629,7 +629,7 @@ var/list/jobban_keylist = list() // Global jobban list.
continue
joblist += temp.title
if ("civiliandept")
for (var/jobPos in civilian_positions)
for (var/jobPos in service_positions)
if (!jobPos)
continue
var/datum/job/temp = SSjobs.GetJob(jobPos)

4
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -356,7 +356,7 @@
pref.job_engsec_high = 0
switch(job.department_flag)
if(CIVILIAN)
if(SERVICE)
switch(level)
if(2)
pref.job_civilian_high = job.flag
@@ -469,7 +469,7 @@
if(!job || !level)
return FALSE
switch(job.department_flag)
if(CIVILIAN)
if(SERVICE)
switch(level)
if(1)
return job_civilian_high

10
code/modules/economy/OrderTerminal.dm
View File

@@ -16,7 +16,7 @@
var/confirmorder = FALSE // Waits for an id to confirm an order
var/receipt = ""
var/ticket = ""
var/destinationact = "Civilian"
var/destinationact = "Service"
var/ticket_number = 1
req_one_access = list(access_bar, access_kitchen) // Access to change the menu
@@ -78,7 +78,7 @@
/obj/machinery/orderterminal/attackby(obj/O, mob/user)
var/obj/item/card/id/I = O.GetID()
if (!I)
if (!I)
return
if (!istype(O))
return
@@ -90,7 +90,7 @@
unlocking = FALSE
else
to_chat(user, SPAN_WARNING("Access denied."))
else if (confirmorder)
var/transaction_amount = sum
var/transaction_purpose = "Idris Ordering Terminal order."
@@ -105,7 +105,7 @@
ticket += "<br><b>Customer:</b> [I.registered_name]"
receipt += "<br><b>Customer:</b> [I.registered_name]"
print_receipt()
sum = 0
sum = 0
receipt = ""
ticket = ""
to_chat(src.loc, SPAN_NOTICE("Transaction completed, please return to the home screen."))
@@ -204,4 +204,4 @@
. = TRUE
. = TRUE
SSvueui.check_uis_for_change(src)
SSvueui.check_uis_for_change(src)

8
code/modules/economy/quikpay.dm
View File

@@ -11,7 +11,7 @@
var/access_code = 0
var/editmode = 0
var/receipt = ""
var/destinationact = "Civilian"
var/destinationact = "Service"
@@ -221,10 +221,10 @@
if(editmode == 0)
to_chat(usr, SPAN_NOTICE("You don't have access to use this option."))
return 0
switch(input("What account would you like to select?", "Destination Account") as null|anything in list("Civilian", "Operations", "Command", "Medical", "Security", "Engineering", "Science"))
switch(input("What account would you like to select?", "Destination Account") as null|anything in list("Service", "Operations", "Command", "Medical", "Security", "Engineering", "Science"))
if("Civilian")
destinationact = "Civilian"
if("Service")
destinationact = "Service"
if("Operations")
destinationact = "Operations"
if("Command")

2
code/modules/mob/abstract/new_player/preferences_setup.dm
View File

@@ -229,7 +229,7 @@
/datum/preferences/proc/return_chosen_high_job(var/title = FALSE)
var/datum/job/chosenJob
if(job_civilian_high)
chosenJob = SSjobs.bitflag_to_job["[CIVILIAN]"]["[job_civilian_high]"]
chosenJob = SSjobs.bitflag_to_job["[SERVICE]"]["[job_civilian_high]"]
else if(job_medsci_high)
chosenJob = SSjobs.bitflag_to_job["[MEDSCI]"]["[job_medsci_high]"]
else if(job_engsec_high)

6
code/modules/modular_computers/file_system/programs/app_presets.dm
View File

@@ -419,9 +419,9 @@
return _prg_list
/datum/modular_computer_app_presets/civilian
name = "civilian"
display_name = "Civilian"
description = "Contains the most common civilian programs."
name = "service"
display_name = "Service"
description = "Contains the most common service programs."
available = TRUE
/datum/modular_computer_app_presets/civilian/return_install_programs(obj/item/modular_computer/comp)

2
code/modules/modular_computers/file_system/programs/command/card.dm
View File

@@ -46,7 +46,7 @@
data["science_jobs"] = format_jobs(science_positions)
data["security_jobs"] = format_jobs(security_positions)
data["cargo_jobs"] = format_jobs(cargo_positions)
data["civilian_jobs"] = format_jobs(civilian_positions)
data["civilian_jobs"] = format_jobs(service_positions)
data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
data["all_centcom_access"] = is_centcom ? get_accesses(1) : null

2
code/modules/world_api/commands/server_query.dm
View File

@@ -191,7 +191,7 @@
"eng" = engineering_positions,
"med" = medical_positions,
"sci" = science_positions,
"civ" = civilian_positions,
"civ" = service_positions,
"bot" = nonhuman_positions
)