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

Rename Intern to Medical Intern #1060

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Rename Intern to Medical Intern #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7c9383
Rename Intern to Medical Intern
m-dzianishchyts Mar 6, 2024
568b735
Bring tts Intern replacement back
m-dzianishchyts Mar 6, 2024
04457ca
Oops, keep consistency
m-dzianishchyts Mar 6, 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
2 changes: 1 addition & 1 deletion code/datums/datacore.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "student_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
if("Intern")
if("Medical Intern")
clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "intern_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
Expand Down
2 changes: 1 addition & 1 deletion config/example/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ job_slot_amounts = [
{name = "Chemist", lowpop = 2, highpop = 2},
{name = "Geneticist", lowpop = 2, highpop = 2},
{name = "Medical Doctor", lowpop = 5, highpop = 6},
{name = "Intern", lowpop = 0, highpop = 0},
{name = "Medical Intern", lowpop = 0, highpop = 0},
{name = "Virologist", lowpop = 1, highpop = 1},
# Science
{name = "Roboticist", lowpop = 2, highpop = 2},
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/jobs/code/card_id.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(card_skins_donor_ss220, list(
registered_name = "Intern"
icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
icon_state = "intern"
rank = "Intern"
rank = "Medical Intern"

/obj/item/card/id/research/student
name = "Student ID"
Expand Down
4 changes: 2 additions & 2 deletions modular_ss220/jobs/code/job/medical_jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/job/doctor/intern
title = "Intern"
title = "Medical Intern"
flag = JOB_INTERN
total_positions = 0
spawn_positions = 3
Expand All @@ -10,7 +10,7 @@
important_information = "Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства."

/datum/outfit/job/doctor/intern
name = "Intern"
name = "Medical Intern"
jobtype = /datum/job/doctor/intern

uniform = /obj/item/clothing/under/rank/medical/doctor/intern
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/jobs/code/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var/is_extra_job = FALSE // Special Jobs Window

/datum/job/doctor
relate_job = "Intern"
relate_job = "Medical Intern"
is_relate_positions = TRUE
/datum/job/doctor/intern
relate_job = "Medical Doctor"
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/jobs/code/jobs_character.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if("Security Cadet")
O = new /datum/outfit/plasmaman/security

if("Intern")
if("Medical Intern")
O = new /datum/outfit/plasmaman/medical

if("Student Scientist")
Expand Down
2 changes: 1 addition & 1 deletion modular_ss220/jobs/code/jobs_global_list.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// ===================== STATION =====================
GLOBAL_LIST_INIT(medical_positions_ss220, list(
"Intern",
"Medical Intern",
))

GLOBAL_LIST_INIT(science_positions_ss220, list(
Expand Down
6 changes: 3 additions & 3 deletions modular_ss220/jobs/code/objects/job_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
)

/obj/effect/mob_spawn/human/intern
name = "Intern"
mob_name = "Intern"
id_job = "Intern"
name = "Medical Intern"
mob_name = "Medical Intern"
id_job = "Medical Intern"
outfit = /datum/outfit/job/doctor/intern

/obj/effect/mob_spawn/human/trainee
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/text_to_speech/code/tts_subsystem.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ SUBSYSTEM_DEF(tts220)
"chief medical officer" = "Главный врач",
"medical doctor" = "Врач",
"Intern" = "Интерн",
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
"Medical Intern" = "Медицинский Интерн",
"Student Medical Doctor" = "Врач-практикант",
"Medical Assistant" = "Ассистирующий врач",
"surgeon" = "Хирург",
Expand Down
Loading