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

Mega branch of IPC changes and crew monitor adjustments. #3567

Merged
merged 7 commits into from
Oct 21, 2024
Merged

Mega branch of IPC changes and crew monitor adjustments. #3567

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
7452353
Copy of Removing IPC Organs from medbay's bounty pool #3509
Gw0sty Sep 26, 2024
9ca521f
Copy of Adding powercord as a printable cybernetic #3517
Gw0sty Sep 26, 2024
08f58d5
Copy of Adjusts crew tracking postions for several postions. #3521
Gw0sty Sep 26, 2024
331ef92
Copy of Makes robotic repairs upgrades actually researchable. #3523
Gw0sty Sep 26, 2024
9aba126
monkestation edits and modularization
Gw0sty Oct 19, 2024
88c2c21
Adjusts crew monitor TGUI to reflect blueshields centcom status
Gw0sty Oct 19, 2024
b3b7458
Linter fix?
Gw0sty Oct 19, 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
4 changes: 3 additions & 1 deletion code/game/machinery/computer/crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
JOB_JANITOR = 68,
JOB_LAWYER = 69,
JOB_PSYCHOLOGIST = 71,
// 200-229: Centcom
// 200-239: Centcom
JOB_CENTCOM_ADMIRAL = 200,
JOB_CENTCOM = 201,
JOB_CENTCOM_OFFICIAL = 210,
Expand All @@ -155,9 +155,11 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
JOB_ERT_CHAPLAIN = 225,
JOB_ERT_JANITOR = 226,
JOB_ERT_DEATHSQUAD = 227,
JOB_NT_REP = 230,
JOB_BLUESHIELD = 231,

// ANYTHING ELSE = UNKNOWN_JOB_ID, Unknowns/custom jobs will appear after civilians, and before assistants
JOB_PRISONER = 998,
JOB_ASSISTANT = 999,
)

Expand Down
5 changes: 5 additions & 0 deletions code/modules/cargo/bounties/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
reward = CARGO_CRATE_VALUE * 5
wanted_types = list(
/obj/item/organ/internal/heart = TRUE,
/obj/item/organ/internal/heart/synth = FALSE, // monkestation edit: prevent easy bounties
/obj/item/organ/internal/heart/cybernetic = FALSE,
/obj/item/organ/internal/heart/cybernetic/tier2 = TRUE,
/obj/item/organ/internal/heart/cybernetic/tier3 = TRUE,
Expand All @@ -16,6 +17,7 @@
required_count = 3
wanted_types = list(
/obj/item/organ/internal/lungs = TRUE,
/obj/item/organ/internal/lungs/synth = FALSE, // monkestation edit: prevent easy bounties
/obj/item/organ/internal/lungs/cybernetic = FALSE,
/obj/item/organ/internal/lungs/cybernetic/tier2 = TRUE,
/obj/item/organ/internal/lungs/cybernetic/tier3 = TRUE,
Expand All @@ -34,6 +36,7 @@
required_count = 3
wanted_types = list(
/obj/item/organ/internal/ears = TRUE,
/obj/item/organ/internal/ears/synth = FALSE,// monkestation edit: prevent easy bounties
/obj/item/organ/internal/ears/cybernetic = FALSE,
/obj/item/organ/internal/ears/cybernetic/upgraded = TRUE,
)
Expand All @@ -45,6 +48,7 @@
required_count = 3
wanted_types = list(
/obj/item/organ/internal/liver = TRUE,
/obj/item/organ/internal/liver/synth = FALSE,// monkestation edit: prevent easy bounties
/obj/item/organ/internal/liver/cybernetic = FALSE,
/obj/item/organ/internal/liver/cybernetic/tier2 = TRUE,
/obj/item/organ/internal/liver/cybernetic/tier3 = TRUE,
Expand All @@ -57,6 +61,7 @@
required_count = 3
wanted_types = list(
/obj/item/organ/internal/eyes = TRUE,
/obj/item/organ/internal/eyes/synth = FALSE,// monkestation edit: prevent easy bounties
/obj/item/organ/internal/eyes/robotic = FALSE,
)

Expand Down
2 changes: 2 additions & 0 deletions code/modules/research/techweb/all_nodes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@
design_ids = list(
"surgery_heal_brute_upgrade",
"surgery_heal_burn_upgrade",
"surgery_heal_robot_upgrade", // monkestation edit: robot surgeries
"surgery_filter_upgrade", // monke edit: improved blood filter surgery
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
Expand All @@ -534,6 +535,7 @@
design_ids = list(
"surgery_heal_brute_upgrade_femto",
"surgery_heal_burn_upgrade_femto",
"surgery_heal_robot_upgrade_femto", // monkestation edit: robot surgeries
"surgery_heal_combo",
"surgery_lobotomy",
"surgery_wing_reconstruction",
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/antagonists/clock_cult/machines/clockwork_operating_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/datum/surgery/healing/brute/upgraded/femto,
/datum/surgery/healing/burn/upgraded/femto,
/datum/surgery/healing/combo/upgraded/femto,
/datum/surgery/robot_healing/experimental,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add monkestation edit comments

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this one need a monkestation edit if its already modularized into the monkestation folder?

/datum/surgery/revival)

/obj/machinery/computer/operating/clockwork/Initialize(mapload)
Expand Down
1 change: 0 additions & 1 deletion monkestation/code/modules/blueshield/devices/crew_monitor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ GLOBAL_DATUM_INIT(blueshield_crewmonitor, /datum/crewmonitor/blueshield, new)
JOB_CHIEF_MEDICAL_OFFICER = 20,
JOB_RESEARCH_DIRECTOR = 30,
JOB_CHIEF_ENGINEER = 40,
JOB_QUARTERMASTER = 50,
JOB_HEAD_OF_PERSONNEL = 60,
JOB_CENTCOM_ADMIRAL = 200,
JOB_CENTCOM = 201,
Expand Down
13 changes: 13 additions & 0 deletions monkestation/code/modules/research/designs/mechfabricator_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,16 @@
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL

/datum/design/power_cord
name = "power cord implant"
desc = "An internal power cord hooked up to a battery. Useful if you run on volts."
id = "power_cord"
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 2500, /datum/material/glass = 2000)
build_path = /obj/item/organ/internal/cyberimp/arm/item_set/power_cord
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
21 changes: 21 additions & 0 deletions monkestation/code/modules/research/designs/medical_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,24 @@
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL

/datum/design/surgery/robot_healing // Apparently this helps the code not scream looking at other examples?
name = "Repair Robotic Limbs"
desc = "A surgical procedure that provides highly effective repairs and maintenance to robotic limbs."
surgery = /datum/surgery/robot_healing
id = "surgery_heal_robot_base"
research_icon_state = "surgery_chest"

/datum/design/surgery/robot_healing/upgraded
name = "Repair Robotic Limbs (Physical) Upgrade"
desc = "A surgical procedure that provides highly effective repairs and maintenance to robotic limbs. Is somewhat more efficient when the patient is severely damaged."
surgery = /datum/surgery/robot_healing/upgraded
id = "surgery_heal_robot_upgrade"
research_icon_state = "surgery_chest"

/datum/design/surgery/robot_healing/upgraded_2
name = "Repair Robotic Limbs (Physical) Upgrade"
desc = "A surgical procedure that quickly provides highly effective repairs and maintenance to robotic limbs. Is moderately more efficient when the patient is severely damaged."
surgery = /datum/surgery/robot_healing/experimental
id = "surgery_heal_robot_upgrade_femto"
research_icon_state = "surgery_chest"
3 changes: 2 additions & 1 deletion monkestation/code/modules/research/techweb/all_nodes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
"ipc_arm_left",
"ipc_arm_right",
"ipc_leg_left",
"ipc_leg_right"
"ipc_leg_right",
"power_cord"
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
2 changes: 1 addition & 1 deletion monkestation/code/modules/smithing/ipcs/surgeries/robot_brain_healing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
return TRUE

/datum/surgery_step/fix_robot_brain
name = "fix posibrain"
name = "fix posibrain (multitool)"
implements = list(
TOOL_MULTITOOL = 100,
TOOL_HEMOSTAT = 35,
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/smithing/ipcs/surgeries/robot_healing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
possible_locs = list(BODY_ZONE_CHEST)
replaced_by = /datum/surgery
requires_bodypart_type = BODYTYPE_ROBOTIC
surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB
surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_SELF_OPERABLE

/// The step to use in the 4th surgery step.
var/healing_step_type
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/CrewConsole.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const jobToColor = (jobId: number) => {
if (jobId >= 60 && jobId < 200) {
return COLORS.department.service;
}
if (jobId >= 200 && jobId < 230) {
if (jobId >= 200 && jobId < 240) {
return COLORS.department.centcom;
}
return COLORS.department.other;
Expand Down
Loading