Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
fast timelocks (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
Waselon authored Nov 12, 2023
1 parent 5695eeb commit 57662b6
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 7 deletions.
14 changes: 7 additions & 7 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@
#define ROLE_VALHALLA "Valhalla"

GLOBAL_LIST_EMPTY(jobs_command)
GLOBAL_LIST_INIT(jobs_officers, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, MECH_PILOT, CORPORATE_LIAISON, SYNTHETIC, SILICON_AI))
GLOBAL_LIST_INIT(jobs_officers, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, MECH_PILOT, CORPORATE_LIAISON, SYNTHETIC, SILICON_AI, SQUAD_LEADER, CHIEF_MEDICAL_OFFICER, CHIEF_SHIP_ENGINEER, REQUISITIONS_OFFICER))
GLOBAL_LIST_INIT(jobs_support, list(PILOT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, SYNTHETIC, SILICON_AI))
GLOBAL_LIST_INIT(jobs_engineering, list(CHIEF_SHIP_ENGINEER, SHIP_TECH))
GLOBAL_LIST_INIT(jobs_engineering, list(CHIEF_SHIP_ENGINEER, SHIP_TECH, SQUAD_ENGINEER))
GLOBAL_LIST_INIT(jobs_requisitions, list(REQUISITIONS_OFFICER))
GLOBAL_LIST_INIT(jobs_medical, list(CHIEF_MEDICAL_OFFICER, MEDICAL_DOCTOR, MEDICAL_RESEARCHER))
GLOBAL_LIST_INIT(jobs_medical, list(CHIEF_MEDICAL_OFFICER, MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_CORPSMAN))
GLOBAL_LIST_INIT(jobs_marines, list(SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE))
GLOBAL_LIST_INIT(jobs_som, list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_CORPSMAN, SOM_SQUAD_LEADER))
GLOBAL_LIST_INIT(jobs_regular_all, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, CHIEF_SHIP_ENGINEER, \
Expand Down Expand Up @@ -141,10 +141,10 @@ GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine),
#define CRYO_DELTA "Delta Squad"


#define XP_REQ_UNSEASONED 60
#define XP_REQ_INTERMEDIATE 180
#define XP_REQ_EXPERIENCED 600
#define XP_REQ_EXPERT 900
#define XP_REQ_UNSEASONED 300 //RuTGMC Edit 60 > 300
#define XP_REQ_INTERMEDIATE 600 //RuTGMC Edit 180 > 600
#define XP_REQ_EXPERIENCED 1200 //RuTGMC Edit 600 > 1200
#define XP_REQ_EXPERT 2400 //RuTGMC Edit 900 > 2400

// how much a job is going to contribute towards burrowed larva. see config for points required to larva. old balance was 1 larva per 3 humans.
#define LARVA_POINTS_SHIPSIDE 1
Expand Down
16 changes: 16 additions & 0 deletions modular_RUtgmc/code/datums/jobs/job/marines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,19 @@
if(!(title in GLOB.start_squad_landmarks_list[squad]))
return pick(GLOB.start_squad_landmarks_list[squad][SQUAD_MARINE])
return pick(GLOB.start_squad_landmarks_list[squad][title])

/datum/job/terragov/squad/corpsman
exp_type = EXP_TYPE_MEDICAL
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/squad/engineer
exp_type = EXP_TYPE_MARINES
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/squad/smartgunner
exp_type = EXP_TYPE_MARINES
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/squad/leader
exp_type = EXP_TYPE_MARINES
exp_requirements = XP_REQ_INTERMEDIATE
55 changes: 55 additions & 0 deletions modular_RUtgmc/code/datums/jobs/job/shipside.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,58 @@
w_uniform = /obj/item/clothing/under/marine/whites/blacks
shoes = /obj/item/clothing/shoes/laceup

/datum/job/terragov/engineering/tech
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/medical/medicalofficer
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/medical/researcher
exp_type = EXP_TYPE_MEDICAL
exp_requirements = XP_REQ_UNSEASONED

/datum/job/terragov/command/pilot
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/engineering/chief
exp_type = EXP_TYPE_ENGINEERING
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/requisitions/officer
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/medical/professor
exp_type = EXP_TYPE_MEDICAL
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/civilian/liaison
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/silicon/ai
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_INTERMEDIATE

/datum/job/terragov/command/fieldcommander
exp_type = EXP_TYPE_MARINES
exp_requirements = XP_REQ_EXPERT

/datum/job/terragov/command/mech_pilot
exp_type = EXP_TYPE_MARINES
exp_requirements = XP_REQ_EXPERIENCED

/datum/job/terragov/silicon/synthetic
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_EXPERIENCED

/datum/job/terragov/command/captain
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_EXPERT

/datum/job/terragov/command/staffofficer
exp_type = EXP_TYPE_REGULAR_ALL
exp_requirements = XP_REQ_INTERMEDIATE
3 changes: 3 additions & 0 deletions modular_RUtgmc/code/datums/jobs/job/xenomorph.dm
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
/datum/job/xenomorph/facehugger
job_flags = JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN

/datum/job/xenomorph/queen
exp_requirements = XP_REQ_INTERMEDIATE

0 comments on commit 57662b6

Please sign in to comment.