Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Rank/Branches | Corecode rewrite #21

Merged
merged 7 commits into from
Jun 10, 2024
Merged

FIX: Rank/Branches | Corecode rewrite #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee53b77
FIX: Rank/Branch fixes
800maximum123 Jun 9, 2024
71b0b34
Fix: Return of AI!
800maximum123 Jun 9, 2024
4381d96
Fix: Exploration's team ranks
800maximum123 Jun 9, 2024
864f9ff
Tweak: Fixing run test
800maximum123 Jun 9, 2024
283bf50
Tweak: Replacing Plasma Rifles
800maximum123 Jun 9, 2024
837bcfd
Рефакторинг
800maximum123 Jun 10, 2024
a59a337
Фиксы и чистки
800maximum123 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions maps/torch_fd/fd_torch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@
// --- JOB SECTION --- //
#include "../torch/job/torch_access.dm"
#include "job/torch_jobs.dm"
#include "job/exploration_team.dm"
#include "../torch/job/command_jobs.dm"
#include "../torch/job/corporate_jobs.dm"
#include "../torch/job/engineering_jobs.dm"
#include "../torch/job/exploration_jobs.dm"
#include "../torch/job/medical_jobs.dm"
#include "../torch/job/misc_jobs.dm"
#include "../torch/job/research_jobs.dm"
#include "../torch/job/security_jobs.dm"
#include "../torch/job/service_jobs.dm"
#include "../torch/job/supply_jobs.dm"

#include "job/command_jobs.dm"
#include "job/corporate_jobs.dm"
#include "job/engineering_jobs.dm"
#include "job/exploration_jobs.dm"
#include "job/medical_jobs.dm"
#include "job/misc_jobs.dm"
#include "job/research_jobs.dm"
#include "job/security_jobs.dm"
#include "job/service_jobs.dm"
#include "job/supply_jobs.dm"

#include "../torch/outfits/scgec.dm"
#include "../torch/robot/module_flying_surveyor.dm"
Expand All @@ -137,6 +137,11 @@
#include "../torch/job/outfits/service_outfits.dm"
#include "../torch/job/outfits/supply_outfits.dm"

// --- JOBS ADDITION --- //
#include "job/addition/exploration_jobs.dm"
#include "job/addition/research_jobs.dm"
#include "job/addition/service_jobs.dm"

// --- MACHINERY --- //
#include "../torch/machinery/apc_shuttle.dm"
#include "../torch/machinery/keycard authentication.dm"
Expand Down
115 changes: 6 additions & 109 deletions maps/torch_fd/job/exploration_team.dm → ...torch_fd/job/addition/exploration_jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@
uniform = /obj/item/clothing/under/solgov/utility/fleet/combat/exploration
shoes = /obj/item/clothing/shoes/dutyboots

/*/decl/hierarchy/outfit/job/torch/crew/exploration/expmed/army
/singleton/hierarchy/outfit/job/torch/crew/exploration/expmed/army
name = OUTFIT_JOB_NAME("Expedition Medic - Army")
uniform = /obj/item/clothing/under/solgov/utility/army/exploration
shoes = /obj/item/clothing/shoes/dutyboots*/
uniform = /obj/item/clothing/under/scga/utility/exploration
shoes = /obj/item/clothing/shoes/dutyboots

/singleton/hierarchy/outfit/job/torch/crew/exploration/expeng
name = OUTFIT_JOB_NAME("Expedition Engineer - Expeditionary Corps")
Expand All @@ -246,112 +246,9 @@
uniform = /obj/item/clothing/under/solgov/utility/fleet/combat/exploration
shoes = /obj/item/clothing/shoes/dutyboots

/*/decl/hierarchy/outfit/job/torch/crew/exploration/expeng/army
/singleton/hierarchy/outfit/job/torch/crew/exploration/expeng/army
name = OUTFIT_JOB_NAME("Expedition Engineer - Army")
uniform = /obj/item/clothing/under/solgov/utility/army/exploration
shoes = /obj/item/clothing/shoes/dutyboots*/
uniform = /obj/item/clothing/under/scga/utility/exploration
shoes = /obj/item/clothing/shoes/dutyboots

// OUTFITS //

// ROLES ITSELF //

/datum/job/expmed
title = "Exploration Medic"
department = "Exploration"
department_flag = EXP
total_positions = 1
spawn_positions = 1
supervisors = "the Commanding Officer, Executive Officer, and Pathfinder"
selection_color = "#68099e"
minimum_character_age = list(SPECIES_HUMAN = 19)
ideal_character_age = 25
outfit_type = /singleton/hierarchy/outfit/job/torch/crew/exploration/expmed
allowed_branches = list(
/datum/mil_branch/expeditionary_corps,
/datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/exploration/expmed/fleet
/*/datum/mil_branch/army = /singleton/hierarchy/outfit/job/torch/crew/exploration/expmed/army*/
)

allowed_ranks = list(
/datum/mil_rank/ec/e3,
/datum/mil_rank/ec/e5,
/datum/mil_rank/fleet/e4,
/datum/mil_rank/fleet/e5
/*/datum/mil_rank/army/e4,
/datum/mil_rank/army/e5*/
)
min_skill = list( SKILL_EVA = SKILL_BASIC,
SKILL_MEDICAL = SKILL_TRAINED
)
max_skill = list( SKILL_MEDICAL = SKILL_EXPERIENCED,
SKILL_ANATOMY = SKILL_TRAINED,
SKILL_PILOT = SKILL_MAX,
SKILL_SCIENCE = SKILL_MAX,
SKILL_COMBAT = SKILL_EXPERIENCED,
SKILL_WEAPONS = SKILL_EXPERIENCED)
skill_points = 22

access = list(
access_explorer, access_maint_tunnels, access_eva, access_emergency_storage,
access_guppy_helm, access_solgov_crew, access_expedition_shuttle, access_guppy, access_hangar,
access_petrov, access_petrov_maint, access_research, access_radio_exp, access_radio_med,
access_medical, access_expedition_shuttle_helm
)

software_on_spawn = list(/datum/computer_file/program/suit_sensors,
/datum/computer_file/program/deck_management)

/datum/job/expmed/get_description_blurb()
return "You are an Exploration Medic. Your duty is to go on expeditions to away sites. The Pathfinder is your team leader. You are to keep your team members alive. Keep a note that you are not a doctor, don't try to preform surgeries on your shuttle as you're not qualified for that."

/datum/job/expeng
title = "Exploration Engineer"
department = "Exploration"
department_flag = EXP
total_positions = 1
spawn_positions = 1
supervisors = "the Commanding Officer, Executive Officer, and Pathfinder"
selection_color = "#68099e"
minimum_character_age = list(SPECIES_HUMAN = 19)
ideal_character_age = 25
outfit_type = /singleton/hierarchy/outfit/job/torch/crew/exploration/expeng
allowed_branches = list(
/datum/mil_branch/expeditionary_corps,
/datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/exploration/expeng/fleet,
/*/datum/mil_branch/army = /singleton/hierarchy/outfit/job/torch/crew/exploration/expeng/army*/
)

allowed_ranks = list(
/datum/mil_rank/ec/e3,
/datum/mil_rank/ec/e5,
/datum/mil_rank/fleet/e3,
/datum/mil_rank/fleet/e4,
/datum/mil_rank/fleet/e5
/*/datum/mil_rank/army/e3,
/datum/mil_rank/army/e4,
/datum/mil_rank/army/e5*/
)
min_skill = list( SKILL_EVA = SKILL_BASIC,
SKILL_CONSTRUCTION = SKILL_BASIC,
SKILL_ELECTRICAL = SKILL_BASIC,
SKILL_MEDICAL = SKILL_BASIC
)
max_skill = list( SKILL_ANATOMY = SKILL_TRAINED,
SKILL_PILOT = SKILL_MAX,
SKILL_SCIENCE = SKILL_MAX,
SKILL_COMBAT = SKILL_EXPERIENCED,
SKILL_WEAPONS = SKILL_EXPERIENCED)
skill_points = 22

access = list(
access_explorer, access_maint_tunnels, access_eva, access_emergency_storage,
access_guppy_helm, access_solgov_crew, access_expedition_shuttle, access_guppy, access_hangar,
access_petrov, access_petrov_maint, access_research, access_radio_exp, access_radio_eng, access_expedition_shuttle_helm
)

software_on_spawn = list(/datum/computer_file/program/deck_management)

/datum/job/expeng/get_description_blurb()
return "You are an Exploration Engineer. Your duty is to go on expeditions to away sites. The Pathfinder is your team leader. You are to keep shuttle operational and make holes wherever your boss says."

// ROLES ITSELF //
47 changes: 3 additions & 44 deletions mods/_fd/fd_assets/code/research_guard.dm → maps/torch_fd/job/addition/research_jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// Access
/var/const/access_research_security = "ACCESS_RESEARCH_SECURITY" //97
var/const/access_research_security = "ACCESS_RESEARCH_SECURITY" //97
/datum/access/rnd_guard
id = access_research_security
desc = "Research Checkpoint"
Expand Down Expand Up @@ -114,52 +114,11 @@
/obj/item/rig_module/cooling_unit)

///Job
/datum/job/research_guard
title = "Research Guard"
department = "Science"
department_flag = SCI
total_positions = 2
spawn_positions = 2
supervisors = "the Chief Science Officer"
selection_color = "#473d63"
economic_power = 5
minimal_player_age = 0
minimum_character_age = list(SPECIES_HUMAN = 26)
outfit_type = /singleton/hierarchy/outfit/job/torch/passenger/research_guard
allowed_branches = list(
/datum/mil_branch/civilian,
/datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/passenger/research_guard/ec
)

allowed_ranks = list(
/datum/mil_rank/civ/contractor,
/datum/mil_rank/ec/e3,
/datum/mil_rank/ec/e5
)
min_skill = list(SKILL_BUREAUCRACY = SKILL_TRAINED,
SKILL_EVA = SKILL_BASIC,
SKILL_COMBAT = SKILL_BASIC,
SKILL_WEAPONS = SKILL_TRAINED
)

max_skill = list( SKILL_COMBAT = SKILL_EXPERIENCED,
SKILL_WEAPONS = SKILL_EXPERIENCED)
skill_points = 20

access = list(
access_research_security, access_tox, access_tox_storage, access_maint_tunnels, access_research, access_xenobiology, access_xenoarch, access_nanotrasen, access_solgov_crew,
access_expedition_shuttle, access_guppy, access_hangar, access_petrov, access_petrov_helm, access_guppy_helm,
access_petrov_analysis, access_petrov_phoron, access_petrov_toxins, access_petrov_chemistry, access_petrov_maint, access_radio_sci
)

software_on_spawn = list(/datum/computer_file/program/camera_monitor)

/datum/job/research_guard/get_description_blurb()
return "You are a security guard from the Organization of the Expeditionary Corps, which must protect the scientific department and its employees from various threats. Eat donuts, call scientists \"eggheads\"."

/*
/datum/map/torch/New()
. = ..()
var/index = allowed_jobs.Find(/datum/job/scientist_assistant)
if(index)
index++
allowed_jobs.Insert(index, /datum/job/research_guard)
*/
0 mods/_fd/fd_assets/code/chief_steward.dm → maps/torch_fd/job/addition/service_jobs.dm
View file
Open in desktop
File renamed without changes.
Loading