cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4482 from CHOMPStation2/upstream-merge-13246

Browse Source 
[MIRROR] Makes Talon Captain restricted behind 60 hours of Talon playtime
This commit is contained in:
Razgriz
2022-07-03 17:14:12 -07:00
committed by GitHub
parent 635eabfe48 1899c08852
commit 3ab2127b75
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/misc_vr.dm
View File

@@ -58,6 +58,7 @@
#define PTO_CARGO "Cargo" #define PTO_CARGO "Cargo"
#define PTO_CIVILIAN "Civilian" #define PTO_CIVILIAN "Civilian"
#define PTO_CYBORG "Cyborg" #define PTO_CYBORG "Cyborg"
#define PTO_TALON "Talon Contractor"
#define DEPARTMENT_TALON "ITV Talon" #define DEPARTMENT_TALON "ITV Talon"

1
code/controllers/subsystems/persist_vr.dm
View File

@@ -63,6 +63,7 @@ SUBSYSTEM_DEF(persist)
LAZYINITLIST(C.play_hours) LAZYINITLIST(C.play_hours)
var/dept_hours = C.department_hours var/dept_hours = C.department_hours
var/play_hours = C.play_hours var/play_hours = C.play_hours
if(!(J.playtime_only))
if(isnum(dept_hours[department_earning])) if(isnum(dept_hours[department_earning]))
dept_hours[department_earning] += pto_factored dept_hours[department_earning] += pto_factored
else else

3
code/game/jobs/job/job_vr.dm
View File

@@ -17,6 +17,9 @@
//Time required in the department as other jobs before playing this one (in hours) //Time required in the department as other jobs before playing this one (in hours)
var/dept_time_required = 0 var/dept_time_required = 0
//Do we forbid ourselves from earning PTO?
var/playtime_only = FALSE
// Check client-specific availability rules. // Check client-specific availability rules.
/datum/job/proc/player_has_enough_pto(client/C) /datum/job/proc/player_has_enough_pto(client/C)
return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, pto_type) > 0) return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, pto_type) > 0)

25
maps/tether/tether_jobs.dm
View File

@@ -25,7 +25,10 @@
selection_color = "#999999" selection_color = "#999999"
economic_modifier = 7 economic_modifier = 7
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
dept_time_required = 60
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Commander" = /datum/alt_title/talon_commander) alt_titles = list("Talon Commander" = /datum/alt_title/talon_commander)
@@ -49,7 +52,9 @@
selection_color = "#aaaaaa" selection_color = "#aaaaaa"
economic_modifier = 5 economic_modifier = 5
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Medic" = /datum/alt_title/talon_medic) alt_titles = list("Talon Medic" = /datum/alt_title/talon_medic)
@@ -74,7 +79,9 @@
selection_color = "#aaaaaa" selection_color = "#aaaaaa"
economic_modifier = 5 economic_modifier = 5
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Technician" = /datum/alt_title/talon_tech) alt_titles = list("Talon Technician" = /datum/alt_title/talon_tech)
@@ -99,7 +106,9 @@
selection_color = "#aaaaaa" selection_color = "#aaaaaa"
economic_modifier = 5 economic_modifier = 5
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Helmsman" = /datum/alt_title/talon_helmsman) alt_titles = list("Talon Helmsman" = /datum/alt_title/talon_helmsman)
@@ -124,7 +133,9 @@
selection_color = "#aaaaaa" selection_color = "#aaaaaa"
economic_modifier = 5 economic_modifier = 5
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Security" = /datum/alt_title/talon_security) alt_titles = list("Talon Security" = /datum/alt_title/talon_security)
@@ -148,7 +159,9 @@
selection_color = "#aaaaaa" selection_color = "#aaaaaa"
economic_modifier = 5 economic_modifier = 5
minimal_player_age = 14 minimal_player_age = 14
pto_type = null playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
access = list(access_talon) access = list(access_talon)
minimal_access = list(access_talon) minimal_access = list(access_talon)
alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator) alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator)