cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 8 - The Great Delete Of Useful Stuff

Browse Source
This commit is contained in:
Kyep
2016-08-21 23:35:13 -07:00
parent e64215ddb1
commit 5d0c5d3dfd
12 changed files with 10 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/preferences.dm
-9
View File
@@ -31,15 +31,6 @@
// Playtime tracking system, see jobs_exp.dm
#define EXP_TYPE_LIVING "Living"
#define EXP_TYPE_CREW "Crew"
#define EXP_TYPE_COMMAND "Command"
#define EXP_TYPE_ENGINEERING "Engineering"
#define EXP_TYPE_MEDICAL "Medical"
#define EXP_TYPE_SCIENCE "Science"
#define EXP_TYPE_SUPPLY "Supply"
#define EXP_TYPE_SECURITY "Security"
#define EXP_TYPE_SILICON "Silicon"
#define EXP_TYPE_SERVICE "Service"
#define EXP_TYPE_WHITELIST "Whitelist"
#define EXP_TYPE_SPECIAL "Special"
#define EXP_TYPE_GHOST "Ghost"
#define EXP_TYPE_EXEMPT "Exempt"
code/controllers/configuration.dm
+3 -15
View File
@@ -128,10 +128,7 @@
var/use_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database
var/use_exp_tracking = 0
var/use_exp_restrictions_heads = 0
var/use_exp_restrictions_heads_hours = 0
var/use_exp_restrictions_heads_department = 0
var/use_exp_restrictions_other = 0
var/use_exp_restrictions = 0
var/use_exp_restrictions_admin_bypass = 0
var/simultaneous_pm_warning_timeout = 100
@@ -249,17 +246,8 @@
if("use_exp_tracking")
config.use_exp_tracking = 1
if("use_exp_restrictions_heads")
config.use_exp_restrictions_heads = 1
if("use_exp_restrictions_heads_hours")
config.use_exp_restrictions_heads_hours = text2num(value)
if("use_exp_restrictions_heads_department")
config.use_exp_restrictions_heads_department = 1
if("use_exp_restrictions_other")
config.use_exp_restrictions_other = 1
if("use_exp_restrictions")
config.use_exp_restrictions = 1
if("use_exp_restrictions_admin_bypass")
config.use_exp_restrictions_admin_bypass = 1
code/game/jobs/job/engineering.dm
-5
View File
@@ -19,7 +19,6 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_ENGINEERING
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -56,8 +55,6 @@
minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
alt_titles = list("Maintenance Technician","Engine Technician","Electrician")
minimal_player_age = 7
exp_requirements = 180
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_or_collect(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
@@ -92,8 +89,6 @@
minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction)
alt_titles = list("Atmospheric Technician")
minimal_player_age = 7
exp_requirements = 180
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_or_collect(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
code/game/jobs/job/job.dm
-1
View File
@@ -43,7 +43,6 @@
var/exp_requirements = 0
var/exp_type = ""
var/exp_type_department = ""
var/admin_only = 0
var/spawn_ert = 0
code/game/jobs/job/medical.dm
-9
View File
@@ -17,7 +17,6 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_MEDICAL
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -54,8 +53,6 @@
minimal_access = list(access_medical, access_morgue, access_surgery, access_maint_tunnels)
alt_titles = list("Surgeon","Nurse","Coroner")
minimal_player_age = 3
exp_requirements = 60
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -119,8 +116,6 @@
minimal_access = list(access_medical, access_chemistry, access_maint_tunnels, access_mineral_storeroom)
alt_titles = list("Pharmacist","Pharmacologist")
minimal_player_age = 7
exp_requirements = 180
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -152,8 +147,6 @@
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research, access_mineral_storeroom)
minimal_access = list(access_medical, access_morgue, access_genetics, access_research, access_maint_tunnels)
minimal_player_age = 3
exp_requirements = 60
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -184,8 +177,6 @@
minimal_access = list(access_medical, access_virology, access_maint_tunnels, access_mineral_storeroom)
alt_titles = list("Pathologist","Microbiologist")
minimal_player_age = 7
exp_requirements = 180
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
code/game/jobs/job/science.dm
-5
View File
@@ -19,7 +19,6 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SCIENCE
// All science-y guys get bonuses for maxing out their tech.
required_objectives=list(
@@ -58,8 +57,6 @@
minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_maint_tunnels, access_mineral_storeroom)
alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher")
minimal_player_age = 3
exp_requirements = 60
exp_type = EXP_TYPE_CREW
// All science-y guys get bonuses for maxing out their tech.
required_objectives=list(
@@ -96,8 +93,6 @@
minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_maint_tunnels, access_mineral_storeroom) //As a job that handles so many corpses, it makes sense for them to have morgue access.
alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")
minimal_player_age = 3
exp_requirements = 60
exp_type = EXP_TYPE_CREW
required_objectives=list(
/datum/job_objective/make_cyborg,
code/game/jobs/job/security.dm
-7
View File
@@ -19,7 +19,6 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SECURITY
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -63,8 +62,6 @@
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons)
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_weapons)
minimal_player_age = 21
exp_requirements = 300
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
@@ -111,8 +108,6 @@
minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons)
alt_titles = list("Forensic Technician")
minimal_player_age = 14
exp_requirements = 300
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec/alt(H), slot_l_ear)
@@ -169,8 +164,6 @@
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_weapons)
minimal_player_age = 14
exp_requirements = 300
exp_type = EXP_TYPE_CREW
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec/alt(H), slot_l_ear)
code/game/jobs/job/silicon.dm
-2
View File
@@ -28,8 +28,6 @@
supervisors = "your laws and the AI" //Nodrak
selection_color = "#ddffdd"
minimal_player_age = 21
exp_requirements = 300
exp_type = EXP_TYPE_CREW
alt_titles = list("Android", "Robot")
equip(var/mob/living/carbon/human/H)
code/game/jobs/job/supervisor.dm
-5
View File
@@ -14,7 +14,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimal_player_age = 30
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_COMMAND
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_or_collect(new /obj/item/device/radio/headset/heads/captain/alt(H), slot_l_ear)
@@ -64,7 +63,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SUPPLY
access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
@@ -244,9 +242,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
alt_titles = list("Lawyer","Public Defender")
minimal_player_age = 30
exp_requirements = 600
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SECURITY
idtype = /obj/item/weapon/card/id/security
equip(var/mob/living/carbon/human/H)
code/game/jobs/job_exp.dm
+4 -24
View File
@@ -32,7 +32,7 @@
return 0
if(!exp_requirements || !exp_type)
return 0
if(!job_is_xp_locked(src.title))
if(!config.use_exp_restrictions)
return 0
if(config.use_exp_restrictions_admin_bypass && check_rights(R_ADMIN, 0, C.mob))
return 0
@@ -48,25 +48,11 @@
return (job_requirement - my_exp)
/datum/job/proc/get_exp_req_amount()
if(title in command_positions)
if(config.use_exp_restrictions_heads_hours)
return config.use_exp_restrictions_heads_hours * 60
return exp_requirements
/datum/job/proc/get_exp_req_type()
if(title in command_positions)
if(config.use_exp_restrictions_heads_department && exp_type_department)
return exp_type_department
return exp_type
/proc/job_is_xp_locked(jobtitle)
if(!config.use_exp_restrictions_heads && jobtitle in command_positions)
return 0
if(!config.use_exp_restrictions_other && !(jobtitle in command_positions))
return 0
return 1
/mob/proc/get_exp_report()
if(client)
return client.get_exp_report()
@@ -76,20 +62,16 @@
/client/proc/get_exp_report()
if(!config.use_exp_tracking)
return "Tracking is disabled in the server configuration file."
var/list/play_records = params2list(prefs.exp)
if(!play_records.len)
return "[key] has no records."
var/return_text = "<UL>"
var/list/exp_data = list()
for(var/cat in exp_jobsmap)
if(text2num(play_records[cat]))
exp_data[cat] = text2num(play_records[cat])
else
exp_data[cat] = 0
for(var/dep in exp_data)
if(exp_data[dep] > 0)
if(dep == EXP_TYPE_EXEMPT)
@@ -106,9 +88,7 @@
var/list/jobs_unlocked = list()
for(var/datum/job/job in job_master.occupations)
if(job.exp_requirements && job.exp_type)
if(!job_is_xp_locked(job.title))
continue
else if(!job.available_in_playtime(mob.client))
if(!job.available_in_playtime(mob.client))
jobs_unlocked += job.title
else
var/xp_req = job.get_exp_req_amount()
@@ -128,8 +108,8 @@
/client/proc/get_exp_living()
var/list/play_records = params2list(prefs.exp)
var/exp_gen = text2num(play_records[EXP_TYPE_LIVING])
return get_exp_format(exp_gen)
var/exp_living = text2num(play_records[EXP_TYPE_LIVING])
return get_exp_format(exp_living)
/proc/get_exp_format(var/expnum)
if(expnum > 60)
code/game/jobs/jobs.dm
+1 -10
View File
@@ -186,16 +186,7 @@ var/list/whitelisted_positions = list(
var/global/list/exp_jobsmap = list(
EXP_TYPE_LIVING = list(), // all living mobs
EXP_TYPE_CREW = list(titles = command_positions | engineering_positions | medical_positions | science_positions | support_positions | supply_positions | security_positions | civilian_positions | list("AI","Cyborg") | whitelisted_positions), // crew positions
EXP_TYPE_COMMAND = list(titles = command_positions),
EXP_TYPE_ENGINEERING = list(titles = engineering_positions),
EXP_TYPE_MEDICAL = list(titles = medical_positions),
EXP_TYPE_SCIENCE = list(titles = science_positions),
EXP_TYPE_SUPPLY = list(titles = supply_positions),
EXP_TYPE_SECURITY = list(titles = security_positions),
EXP_TYPE_SILICON = list(titles = list("AI","Cyborg")),
EXP_TYPE_SERVICE = list(titles = service_positions),
EXP_TYPE_WHITELIST = list(titles = whitelisted_positions), // karma-locked jobs
EXP_TYPE_SPECIAL = list(), // antags, ERT, etc
EXP_TYPE_GHOST = list(), // dead people, observers
EXP_TYPE_EXEMPT = list() // special grandfather setting
)
)
config/example/config.txt
+2 -8
View File
@@ -19,14 +19,8 @@ JOBS_HAVE_MINIMAL_ACCESS
##Unhash this to track player playtime in the database. Requires database to be enabled.
#USE_EXP_TRACKING
##Unhash this to enable playtime requirements for head jobs.
#USE_EXP_RESTRICTIONS_HEADS
##Unhash this to override head jobs' playtime requirements with this number of hours.
#USE_EXP_RESTRICTIONS_HEADS_HOURS 15
##Unhash this to change head jobs' playtime requirements so that they're based on department playtime, rather than crew playtime.
#USE_EXP_RESTRICTIONS_HEADS_DEPARTMENT
##Unhash this to enable playtime requirements for certain non-head jobs, like Engineer and Scientist.
#USE_EXP_RESTRICTIONS_OTHER
##Unhash this to enable playtime requirements for jobs that have them defined.
#USE_EXP_RESTRICTIONS
##Unhash this to allow admins to bypass job playtime requirements.
#USE_EXP_RESTRICTIONS_ADMIN_BYPASS