cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replacing civilian with support department. Still need to make changes on MySQL schema.

Browse Source
This commit is contained in:
ZomgPonies
2014-06-26 19:42:14 -04:00
parent 7ab91efdff
commit cb9b6fca4d
20 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/computer3/computers/card.dm
+2 -2
View File
@@ -76,8 +76,8 @@
jobs_all += "<td weight='100'><a href='?src=\ref[src];assign=[job]'>[replacetext(job, " ", "&nbsp")]</a></td>"
counter = 0
jobs_all += "</tr><tr height='20'><td><font color='#808080'><b>Civilian</b></font></td>"//Grey
for(var/job in civilian_positions)
jobs_all += "</tr><tr height='20'><td><font color='#808080'><b>Support</b></font></td>"//Grey
for(var/job in support_positions)
counter++
if(counter >= 6)
jobs_all += "</tr><tr height='20'><td></td><td></td>"
code/defines/obj.dm
+13 -13
View File
@@ -99,7 +99,7 @@
var/list/eng = new()
var/list/med = new()
var/list/sci = new()
var/list/civ = new()
var/list/supp = new()
var/list/bot = new()
var/list/misc = new()
var/list/isactive = new()
@@ -148,8 +148,8 @@
if(real_rank in science_positions)
sci[name] = rank
department = 1
if(real_rank in civilian_positions)
civ[name] = rank
if(real_rank in support_positions)
supp[name] = rank
department = 1
if(real_rank in nonhuman_positions)
bot[name] = rank
@@ -181,10 +181,10 @@
for(name in sci)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[sci[name]]</td><td>[isactive[name]]</td></tr>"
even = !even
if(civ.len > 0)
dat += "<tr><th colspan=3>Civilian</th></tr>"
for(name in civ)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[civ[name]]</td><td>[isactive[name]]</td></tr>"
if(supp.len > 0)
dat += "<tr><th colspan=3>Support</th></tr>"
for(name in supp)
dat += "<tr[even ? " class='alt'" : ""]><td>[name]</td><td>[supp[name]]</td><td>[isactive[name]]</td></tr>"
even = !even
// in case somebody is insane and added them to the manifest, why not
if(bot.len > 0)
@@ -222,7 +222,7 @@ var/global/list/PDA_Manifest = list()
var/eng[0]
var/med[0]
var/sci[0]
var/civ[0]
var/supp[0]
var/bot[0]
var/misc[0]
for(var/datum/data/record/t in data_core.general)
@@ -263,11 +263,11 @@ var/global/list/PDA_Manifest = list()
if(depthead && sci.len != 1)
sci.Swap(1,sci.len)
if(real_rank in civilian_positions)
civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive)
if(real_rank in support_positions)
supp[++supp.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
if(depthead && civ.len != 1)
civ.Swap(1,civ.len)
if(depthead && supp.len != 1)
supp.Swap(1,supp.len)
if(real_rank in nonhuman_positions)
bot[++bot.len] = list("name" = name, "rank" = rank, "active" = isactive)
@@ -283,7 +283,7 @@ var/global/list/PDA_Manifest = list()
"eng" = eng,\
"med" = med,\
"sci" = sci,\
"civ" = civ,\
"supp" = supp,\
"bot" = bot,\
"misc" = misc\
)
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
+8 -8
View File
@@ -1,26 +1,26 @@
datum/directive/terminations/financial_crisis
special_orders = list(
"Suspend financial accounts of all civilian personnel, excluding the Head of Personnel.",
"Suspend financial accounts of all support personnel, excluding the Head of Personnel.",
"Transfer their payrolls to the station account.",
"Terminate their employment.")
datum/directive/terminations/financial_crisis/get_crew_to_terminate()
var/list/civilians[0]
var/list/candidates = civilian_positions - "Head of Personnel"
var/list/support[0]
var/list/candidates = support_positions - "Head of Personnel"
for(var/mob/M in player_list)
if (M.is_ready() && candidates.Find(M.mind.assigned_role))
civilians+=(M)
return civilians
support+=(M)
return support
datum/directive/terminations/financial_crisis/get_description()
return {"
<p>
[system_name()] system banks in financial crisis. Local emergency situation ongoing.
NT Funds redistributed, impact upon civilian department expected.
NT Funds redistributed, impact upon support department expected.
Further information is classified.
</p>
"}
datum/directive/terminations/financial_crisis/meets_prerequisites()
var/list/civilians = get_crew_to_terminate()
return civilians.len >= 5
var/list/support = get_crew_to_terminate()
return support.len >= 5
code/game/gamemodes/nations/nations.dm
+2 -2
View File
@@ -115,7 +115,7 @@ datum/game_mode/nations
H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
continue
else if(H.mind.assigned_role in civilian_positions)
else if(H.mind.assigned_role in support_positions)
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
H.hud_updateflag |= 1 << NATIONS_HUD
var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
@@ -402,7 +402,7 @@ datum/game_mode/nations
H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
return 1
else if(H.mind.assigned_role in civilian_positions)
else if(H.mind.assigned_role in support_positions)
H.mind.nation = all_nations["People's Republic of Commandzakstan"]
H.hud_updateflag |= 1 << NATIONS_HUD
var/I = image('icons/mob/hud.dmi', loc = H.mind.current, icon_state = "hudcommand")
code/game/jobs/job/assistant.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/job/assistant
title = "Assistant"
flag = ASSISTANT
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = -1
spawn_positions = -1
code/game/jobs/job/civilian.dm
+10 -10
View File
@@ -2,7 +2,7 @@
/datum/job/bartender
title = "Bartender"
flag = BARTENDER
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -48,7 +48,7 @@
/datum/job/chef
title = "Chef"
flag = CHEF
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -77,7 +77,7 @@
/datum/job/hydro
title = "Botanist"
flag = BOTANIST
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 3
spawn_positions = 2
@@ -110,7 +110,7 @@
/datum/job/qm
title = "Quartermaster"
flag = QUARTERMASTER
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -140,7 +140,7 @@
/datum/job/cargo_tech
title = "Cargo Technician"
flag = CARGOTECH
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 2
spawn_positions = 2
@@ -168,7 +168,7 @@
/datum/job/mining
title = "Shaft Miner"
flag = MINER
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 3
spawn_positions = 3
@@ -207,7 +207,7 @@
/datum/job/clown
title = "Clown"
flag = CLOWN
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -244,7 +244,7 @@
/datum/job/mime
title = "Mime"
flag = MIME
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -289,7 +289,7 @@
/datum/job/janitor
title = "Janitor"
flag = JANITOR
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -318,7 +318,7 @@
/datum/job/librarian
title = "Librarian"
flag = LIBRARIAN
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
code/game/jobs/job/civilian_chaplain.dm
+1 -1
View File
@@ -2,7 +2,7 @@
/datum/job/chaplain
title = "Chaplain"
flag = CHAPLAIN
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
code/game/jobs/job/supervisor.dm
+2 -2
View File
@@ -48,7 +48,7 @@
/datum/job/hop
title = "Head of Personnel"
flag = HOP
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -236,7 +236,7 @@
/datum/job/lawyer
title = "Internal Affairs Agent"
flag = LAWYER
department_flag = CIVILIAN
department_flag = SUPPORT
faction = "Station"
total_positions = 2
spawn_positions = 2
code/game/jobs/jobs.dm
+2 -2
View File
@@ -28,7 +28,7 @@ var/const/XENOBIOLOGIST =(1<<9)
var/const/PARAMEDIC =(1<<10)
var/const/CIVILIAN =(1<<2)
var/const/SUPPORT =(1<<2)
var/const/HOP =(1<<0)
var/const/BARTENDER =(1<<1)
@@ -98,7 +98,7 @@ var/list/science_positions = list(
)
//BS12 EDIT
var/list/civilian_positions = list(
var/list/support_positions = list(
"Head of Personnel",
"Bartender",
"Botanist",
code/game/machinery/computer/card.dm
+1 -1
View File
@@ -81,7 +81,7 @@
data["medical_jobs"] = format_jobs(medical_positions)
data["science_jobs"] = format_jobs(science_positions)
data["security_jobs"] = format_jobs(security_positions)
data["civilian_jobs"] = format_jobs(civilian_positions)
data["support_jobs"] = format_jobs(support_positions)
data["special_jobs"] = format_jobs(whitelisted_positions)
data["centcom_jobs"] = format_jobs(get_all_centcom_jobs())
code/modules/admin/topic.dm
+33 -33
View File
@@ -232,7 +232,7 @@
emergency_shuttle.call_evac()
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
else if (emergency_shuttle.can_recall())
emergency_shuttle.recall()
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
@@ -549,11 +549,11 @@
counter = 0
jobs += "</tr></table>"
//Civilian (Grey)
//Support (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];jobban3=civiliandept;jobban4=\ref[M]'>Civilian Positions</a></th></tr><tr align='center'>"
for(var/jobPos in civilian_positions)
jobs += "<tr bgcolor='dddddd'><th colspan='[length(support_positions)]'><a href='?src=\ref[src];jobban3=supportdept;jobban4=\ref[M]'>Support Positions</a></th></tr><tr align='center'>"
for(var/jobPos in support_positions)
if(!jobPos) continue
var/datum/job/job = job_master.GetJob(jobPos)
if(!job) continue
@@ -688,7 +688,7 @@
jobs += "</tr></table>"
//Civilian (Grey)
//Support (Grey)
counter = 0
jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
jobs += "<tr bgcolor='dddddd'><th colspan='[length(whitelisted_positions)]'><a href='?src=\ref[src];jobban3=whitelistdept;jobban4=\ref[M]'>Whitelisted Positions</a></th></tr><tr align='center'>"
@@ -765,8 +765,8 @@
var/datum/job/temp = job_master.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("civiliandept")
for(var/jobPos in civilian_positions)
if("supportdept")
for(var/jobPos in support_positions)
if(!jobPos) continue
var/datum/job/temp = job_master.GetJob(jobPos)
if(!temp) continue
@@ -2048,20 +2048,20 @@
if("launchshuttle")
if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created.
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShL")
var/list/valid_shuttles = list()
for (var/shuttle_tag in shuttle_controller.shuttles)
if (istype(shuttle_controller.shuttles[shuttle_tag], /datum/shuttle/ferry))
valid_shuttles += shuttle_tag
var/shuttle_tag = input("Which shuttle do you want to launch?") as null|anything in valid_shuttles
if (!shuttle_tag)
return
var/datum/shuttle/ferry/S = shuttle_controller.shuttles[shuttle_tag]
if (S.can_launch())
S.launch(usr)
@@ -2069,23 +2069,23 @@
log_admin("[key_name(usr)] launched the [shuttle_tag] shuttle")
else
alert("The [shuttle_tag] shuttle cannot be launched at this time. It's probably busy.")
if("forcelaunchshuttle")
if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created.
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShFL")
var/list/valid_shuttles = list()
for (var/shuttle_tag in shuttle_controller.shuttles)
if (istype(shuttle_controller.shuttles[shuttle_tag], /datum/shuttle/ferry))
valid_shuttles += shuttle_tag
var/shuttle_tag = input("Which shuttle's launch do you want to force?") as null|anything in valid_shuttles
if (!shuttle_tag)
return
var/datum/shuttle/ferry/S = shuttle_controller.shuttles[shuttle_tag]
if (S.can_force())
S.force_launch(usr)
@@ -2093,31 +2093,31 @@
log_admin("[key_name(usr)] has forced the [shuttle_tag] shuttle launch")
else
alert("The [shuttle_tag] shuttle launch cannot be forced at this time. It's busy, or hasn't been launched yet.")
if("jumpshuttle")
if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created.
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShJ")
var/shuttle_tag = input("Which shuttle do you want to jump?") as null|anything in shuttle_controller.shuttles
if (!shuttle_tag) return
var/datum/shuttle/S = shuttle_controller.shuttles[shuttle_tag]
var/origin_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world
if (!origin_area) return
var/destination_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world
if (!destination_area) return
var/long_jump = alert("Is there a transition area for this jump?","", "Yes", "No")
if (long_jump == "Yes")
var/transition_area = input("Which area is the transition area? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world
if (!transition_area) return
var/move_duration = input("How many seconds will this jump take?") as num
S.long_jump(origin_area, destination_area, transition_area, move_duration)
message_admins("\blue [key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle", 1)
log_admin("[key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle")
@@ -2125,29 +2125,29 @@
S.short_jump(origin_area, destination_area)
message_admins("\blue [key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle", 1)
log_admin("[key_name_admin(usr)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle")
if("moveshuttle")
if(!shuttle_controller) return // Something is very wrong, the shuttle controller has not been created.
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShM")
var/confirm = alert("This command directly moves a shuttle from one area to another. DO NOT USE THIS UNLESS YOU ARE DEBUGGING A SHUTTLE AND YOU KNOW WHAT YOU ARE DOING.", "Are you sure?", "Ok", "Cancel")
if (confirm == "Cancel")
return
var/shuttle_tag = input("Which shuttle do you want to jump?") as null|anything in shuttle_controller.shuttles
if (!shuttle_tag) return
var/datum/shuttle/S = shuttle_controller.shuttles[shuttle_tag]
var/origin_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world
if (!origin_area) return
var/destination_area = input("Which area is the shuttle at now? (MAKE SURE THIS IS CORRECT OR THINGS WILL BREAK)") as null|area in world
if (!destination_area) return
S.move(origin_area, destination_area)
message_admins("\blue [key_name_admin(usr)] moved the [shuttle_tag] shuttle", 1)
log_admin("[key_name(usr)] moved the [shuttle_tag] shuttle")
code/modules/awaymissions/corpse.dm
+1 -1
View File
@@ -126,7 +126,7 @@
///////////Civilians//////////////////////
///////////Support//////////////////////
/obj/effect/landmark/corpse/chef
name = "Chef"
code/modules/client/preferences.dm
+36 -36
View File
@@ -84,9 +84,9 @@ datum/preferences
var/icon/preview_icon_side = null
//Jobs, uses bitflags
var/job_civilian_high = 0
var/job_civilian_med = 0
var/job_civilian_low = 0
var/job_support_high = 0
var/job_support_med = 0
var/job_support_low = 0
var/job_medsci_high = 0
var/job_medsci_med = 0
@@ -400,7 +400,7 @@ datum/preferences
var/available_in_days = job.available_in_days(user.client)
HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
continue
if((job_civilian_low & ASSISTANT) && (rank != "Assistant"))
if((job_support_low & ASSISTANT) && (rank != "Assistant"))
HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
continue
if((rank in command_positions) || (rank == "AI"))//Bold head jobs
@@ -442,7 +442,7 @@ datum/preferences
// HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
if(rank == "Assistant")//Assistant is special
if(job_civilian_low & ASSISTANT)
if(job_support_low & ASSISTANT)
HTML += " <font color=green>\[Yes]</font>"
else
HTML += " <font color=red>\[No]</font>"
@@ -498,27 +498,27 @@ datum/preferences
if (level == 1) // to high
// remove any other job(s) set to high
job_civilian_med |= job_civilian_high
job_support_med |= job_support_high
job_engsec_med |= job_engsec_high
job_medsci_med |= job_medsci_high
job_karma_med |= job_karma_high
job_civilian_high = 0
job_support_high = 0
job_engsec_high = 0
job_medsci_high = 0
job_karma_high = 0
if (job.department_flag == CIVILIAN)
job_civilian_low &= ~job.flag
job_civilian_med &= ~job.flag
job_civilian_high &= ~job.flag
if (job.department_flag == SUPPORT)
job_support_low &= ~job.flag
job_support_med &= ~job.flag
job_support_high &= ~job.flag
switch(level)
if (1)
job_civilian_high |= job.flag
job_support_high |= job.flag
if (2)
job_civilian_med |= job.flag
job_support_med |= job.flag
if (3)
job_civilian_low |= job.flag
job_support_low |= job.flag
return 1
else if (job.department_flag == ENGSEC)
@@ -580,10 +580,10 @@ datum/preferences
return
if(role == "Assistant")
if(job_civilian_low & job.flag)
job_civilian_low &= ~job.flag
if(job_support_low & job.flag)
job_support_low &= ~job.flag
else
job_civilian_low |= job.flag
job_support_low |= job.flag
SetChoices(user)
return 1
@@ -677,10 +677,10 @@ datum/preferences
return
if(role == "Assistant")
if(job_civilian_low & job.flag)
job_civilian_low &= ~job.flag
if(job_support_low & job.flag)
job_support_low &= ~job.flag
else
job_civilian_low |= job.flag
job_support_low |= job.flag
SetChoices(user)
return 1
@@ -697,9 +697,9 @@ datum/preferences
return 1
proc/ResetJobs()
job_civilian_high = 0
job_civilian_med = 0
job_civilian_low = 0
job_support_high = 0
job_support_med = 0
job_support_low = 0
job_medsci_high = 0
job_medsci_med = 0
@@ -717,14 +717,14 @@ datum/preferences
proc/GetJobDepartment(var/datum/job/job, var/level)
if(!job || !level) return 0
switch(job.department_flag)
if(CIVILIAN)
if(SUPPORT)
switch(level)
if(1)
return job_civilian_high
return job_support_high
if(2)
return job_civilian_med
return job_support_med
if(3)
return job_civilian_low
return job_support_low
if(MEDSCI)
switch(level)
if(1)
@@ -755,32 +755,32 @@ datum/preferences
if(!job || !level) return 0
switch(level)
if(1)//Only one of these should ever be active at once so clear them all here
job_civilian_high = 0
job_support_high = 0
job_medsci_high = 0
job_engsec_high = 0
job_karma_high = 0
return 1
if(2)//Set current highs to med, then reset them
job_civilian_med |= job_civilian_high
job_support_med |= job_support_high
job_medsci_med |= job_medsci_high
job_engsec_med |= job_engsec_high
job_karma_med |= job_karma_high
job_civilian_high = 0
job_support_high = 0
job_medsci_high = 0
job_engsec_high = 0
job_karma_high = 0
switch(job.department_flag)
if(CIVILIAN)
if(SUPPORT)
switch(level)
if(2)
job_civilian_high = job.flag
job_civilian_med &= ~job.flag
job_support_high = job.flag
job_support_med &= ~job.flag
if(3)
job_civilian_med |= job.flag
job_civilian_low &= ~job.flag
job_support_med |= job.flag
job_support_low &= ~job.flag
else
job_civilian_low |= job.flag
job_support_low |= job.flag
if(MEDSCI)
switch(level)
if(2)
code/modules/client/preferences_mysql.dm
+8 -8
View File
@@ -95,9 +95,9 @@
//Jobs
alternate_option = text2num(query.item[30])
job_civilian_high = text2num(query.item[31])
job_civilian_med = text2num(query.item[32])
job_civilian_low = text2num(query.item[33])
job_support_high = text2num(query.item[31])
job_support_med = text2num(query.item[32])
job_support_low = text2num(query.item[33])
job_medsci_high = text2num(query.item[34])
job_medsci_med = text2num(query.item[35])
job_medsci_low = text2num(query.item[36])
@@ -151,9 +151,9 @@
b_type = sanitize_text(b_type, initial(b_type))
alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))
job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
job_civilian_med = sanitize_integer(job_civilian_med, 0, 65535, initial(job_civilian_med))
job_civilian_low = sanitize_integer(job_civilian_low, 0, 65535, initial(job_civilian_low))
job_support_high = sanitize_integer(job_support_high, 0, 65535, initial(job_support_high))
job_support_med = sanitize_integer(job_support_med, 0, 65535, initial(job_support_med))
job_support_low = sanitize_integer(job_support_low, 0, 65535, initial(job_support_low))
job_medsci_high = sanitize_integer(job_medsci_high, 0, 65535, initial(job_medsci_high))
job_medsci_med = sanitize_integer(job_medsci_med, 0, 65535, initial(job_medsci_med))
job_medsci_low = sanitize_integer(job_medsci_low, 0, 65535, initial(job_medsci_low))
@@ -184,14 +184,14 @@
firstquery.Execute()
while(firstquery.NextRow())
if(text2num(firstquery.item[1]) == default_slot)
var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sanitizeSQL(metadata)]',real_name='[sanitizeSQL(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sanitizeSQL(species)]',language='[sanitizeSQL(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sanitizeSQL(h_style)]',facial_style_name='[sanitizeSQL(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_civilian_high='[job_civilian_high]',job_civilian_med='[job_civilian_med]',job_civilian_low='[job_civilian_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sanitizeSQL(flavor_text)]',med_record='[sanitizeSQL(med_record)]',sec_record='[sanitizeSQL(sec_record)]',gen_record='[sanitizeSQL(gen_record)]',player_alt_titles='[sanitizeSQL(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sanitizeSQL(metadata)]',real_name='[sanitizeSQL(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sanitizeSQL(species)]',language='[sanitizeSQL(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sanitizeSQL(h_style)]',facial_style_name='[sanitizeSQL(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sanitizeSQL(flavor_text)]',med_record='[sanitizeSQL(med_record)]',sec_record='[sanitizeSQL(sec_record)]',gen_record='[sanitizeSQL(gen_record)]',player_alt_titles='[sanitizeSQL(playertitlelist)]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',nanotrasen_relation='[nanotrasen_relation]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
return
return 1
var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_civilian_high,job_civilian_med,job_civilian_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,nanotrasen_relation) VALUES ('[C.ckey]','[default_slot]','[sanitizeSQL(metadata)]','[sanitizeSQL(real_name)]','[be_random_name]','[gender]','[age]','[sanitizeSQL(species)]','[sanitizeSQL(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sanitizeSQL(h_style)]','[sanitizeSQL(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_civilian_high]','[job_civilian_med]','[job_civilian_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sanitizeSQL(flavor_text)]','[sanitizeSQL(med_record)]','[sanitizeSQL(sec_record)]','[sanitizeSQL(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[nanotrasen_relation]')")
var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_support_high,job_support_med,job_support_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,nanotrasen_relation) VALUES ('[C.ckey]','[default_slot]','[sanitizeSQL(metadata)]','[sanitizeSQL(real_name)]','[be_random_name]','[gender]','[age]','[sanitizeSQL(species)]','[sanitizeSQL(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sanitizeSQL(h_style)]','[sanitizeSQL(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_support_high]','[job_support_med]','[job_support_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sanitizeSQL(flavor_text)]','[sanitizeSQL(med_record)]','[sanitizeSQL(sec_record)]','[sanitizeSQL(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[nanotrasen_relation]')")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
code/modules/clothing/under/jobs/civilian.dm
+1 -1
View File
@@ -1,4 +1,4 @@
//Alphabetical order of civilian jobs.
//Alphabetical order of support jobs.
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
code/modules/clothing/under/syndicate.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/under/syndicate
name = "tactical turtleneck"
desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
desc = "It's some non-descript, slightly suspicious looking, support clothing."
icon_state = "syndicate"
item_state = "bl_suit"
_color = "syndicate"
code/modules/economy/Job_Departments.dm
+11 -11
View File
@@ -1,4 +1,4 @@
var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian")
var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support")
// The department the job belongs to.
/datum/job/var/department = null
@@ -9,26 +9,26 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
/datum/job/captain/department = "Command"
/datum/job/captain/head_position = 1
/datum/job/hop/department = "Civilian"
/datum/job/hop/department = "Support"
/datum/job/hop/head_position = 1
/datum/job/assistant/department = "Civilian"
/datum/job/assistant/department = "Support"
/datum/job/bartender/department = "Civilian"
/datum/job/bartender/department = "Support"
/datum/job/chef/department = "Civilian"
/datum/job/chef/department = "Support"
/datum/job/hydro/department = "Civilian"
/datum/job/hydro/department = "Support"
/datum/job/mining/department = "Civilian"
/datum/job/mining/department = "Support"
/datum/job/janitor/department = "Civilian"
/datum/job/janitor/department = "Support"
/datum/job/librarian/department = "Civilian"
/datum/job/librarian/department = "Support"
/datum/job/lawyer/department = "Civilian"
/datum/job/lawyer/department = "Support"
/datum/job/chaplain/department = "Civilian"
/datum/job/chaplain/department = "Support"
/datum/job/qm/department = "Cargo"
/datum/job/qm/head_position = 1
code/modules/mob/new_player/preferences_setup.dm
+4 -4
View File
@@ -262,7 +262,7 @@ datum/preferences
var/uniform_dmi='icons/mob/uniform.dmi'
if(disabilities&DISABILITY_FLAG_FAT)
uniform_dmi='icons/mob/uniform_fat.dmi'
if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
if(job_support_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon(uniform_dmi, "grey_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
@@ -270,8 +270,8 @@ datum/preferences
else if(backbag == 3 || backbag == 4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
switch(job_civilian_high)
else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
switch(job_support_high)
if(HOP)
clothes_s = new /icon(uniform_dmi, "hop_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
@@ -703,4 +703,4 @@ datum/preferences
del(eyes_s)
del(underwear_s)
del(undershirt_s)
del(clothes_s)
del(clothes_s)