forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HUD, Карты, альт-роли, одежда, должности, внесение в глобал списки
- Loading branch information
1 parent
e035bd9
commit a7f5dcc
Showing
12 changed files
with
196 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/obj/item/clothing/under/rank/engineer/trainee | ||
name = "engineer trainee jumpsuit" | ||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||
//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' | ||
//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' | ||
icon_state = "trainee_s" | ||
item_color = "trainee" | ||
sprite_sheets = null | ||
|
||
/obj/item/clothing/under/rank/engineer/trainee/skirt | ||
name = "engineer trainee jumpskirt" | ||
icon_state = "traineef_s" | ||
item_color = "traineef" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS | ||
|
||
/obj/item/clothing/under/rank/engineer/trainee/assistant | ||
name = "engineer assistant jumpsuit" | ||
icon_state = "eng_ass_s" | ||
item_color = "eng_ass" | ||
|
||
/obj/item/clothing/under/rank/engineer/trainee/assistant/skirt | ||
name = "engineer assistant jumpskirt" | ||
icon_state = "eng_ass_f_s" | ||
item_color = "eng_ass_f" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/obj/item/clothing/under/rank/scientist/student | ||
name = "scientist student jumpsuit" | ||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||
//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' | ||
//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' | ||
icon_state = "student_s" | ||
item_color = "student" | ||
sprite_sheets = null | ||
|
||
/obj/item/clothing/under/rank/scientist/student/skirt | ||
name = "scientist student jumpskirt" | ||
icon_state = "studentf_s" | ||
item_color = "studentf" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS | ||
|
||
/obj/item/clothing/under/rank/scientist/student/assistant | ||
name = "scientist assistant jumpsuit" | ||
icon_state = "sci_ass_s" | ||
item_color = "sci_ass" | ||
|
||
/obj/item/clothing/under/rank/scientist/student/assistant/skirt | ||
name = "scientist assistant jumpskirt" | ||
icon_state = "sci_ass_f_s" | ||
item_color = "sci_ass_f" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/obj/item/clothing/under/rank/security/cadet | ||
name = "security cadet jumpsuit" | ||
icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' | ||
icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' | ||
//lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' | ||
//righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' | ||
icon_state = "cadet_s" | ||
item_color = "cadet" | ||
sprite_sheets = null | ||
|
||
/obj/item/clothing/under/rank/security/cadet/skirt | ||
name = "security cadet jumpskirt" | ||
icon_state = "cadetf_s" | ||
item_color = "cadetf" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS | ||
|
||
/obj/item/clothing/under/rank/security/cadet/assistant | ||
name = "security assistant jumpsuit" | ||
icon_state = "sec_ass_s" | ||
item_color = "sec_ass" | ||
|
||
/obj/item/clothing/under/rank/security/cadet/assistant/skirt | ||
name = "security assistant jumpskirt" | ||
icon_state = "sec_ass_f_s" | ||
item_color = "sec_ass_f" | ||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/datum/job/engineer/New() | ||
. = ..() | ||
alt_titles |= get_all_engineering_novice_tittles() | ||
|
||
/datum/station_department/engineering/New() | ||
. = ..() | ||
department_roles |= get_all_engineering_novice_tittles() | ||
|
||
/datum/outfit/job/engineer/pre_equip(mob/living/carbon/human/H, visualsOnly) | ||
. = ..() | ||
if(H.mind && H.mind.role_alt_title) | ||
if(H.mind.role_alt_title in get_all_engineering_novice_tittles()) | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee/skirt | ||
id = /obj/item/card/id/engineering/trainee | ||
gloves = /obj/item/clothing/gloves/color/orange | ||
|
||
switch(H.mind.role_alt_title) | ||
if("Engineer Assistant") | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt | ||
if("Technical Assistant") | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/engineer/trainee/assistant/skirt | ||
head = /obj/item/clothing/head/soft/orange | ||
if("Technical Student", "Technical Trainee") | ||
head = /obj/item/clothing/head/soft/orange | ||
if("Engineer Student") | ||
head = /obj/item/clothing/head/beret/eng |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/datum/job/scientist/New() | ||
. = ..() | ||
alt_titles |= get_all_science_novice_tittles() | ||
|
||
/datum/station_department/science/New() | ||
. = ..() | ||
department_roles |= get_all_science_novice_tittles() | ||
|
||
/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H, visualsOnly) | ||
. = ..() | ||
if(H.mind && H.mind.role_alt_title) | ||
if(H.mind.role_alt_title in get_all_science_novice_tittles()) | ||
uniform = /obj/item/clothing/under/rank/scientist/student | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/scientist/student/skirt | ||
id = /obj/item/card/id/research/student | ||
|
||
switch(H.mind.role_alt_title) | ||
if("Scientist Assistant") | ||
uniform = /obj/item/clothing/under/rank/scientist/student/assistant | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/scientist/student/assistant/skirt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/datum/job/officer/New() | ||
. = ..() | ||
alt_titles = get_all_security_novice_tittles() // =, а не |=, т.к. отсутствуют альт. названия | ||
|
||
/datum/station_department/security/New() | ||
. = ..() | ||
department_roles |= get_all_security_novice_tittles() | ||
|
||
/datum/outfit/job/officer/pre_equip(mob/living/carbon/human/H, visualsOnly) | ||
. = ..() | ||
if(H.mind && H.mind.role_alt_title) | ||
if(H.mind.role_alt_title in get_all_security_novice_tittles()) | ||
uniform = /obj/item/clothing/under/rank/security/cadet | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/security/cadet/skirt | ||
head = /obj/item/clothing/head/soft/sec | ||
id = /obj/item/card/id/security/cadet | ||
l_pocket = /obj/item/reagent_containers/spray/pepper | ||
//box = /obj/item/storage/box/survival_security/cadet | ||
switch(H.mind.role_alt_title) | ||
if("Security Assistant") | ||
uniform = /obj/item/clothing/under/rank/security/cadet/assistant | ||
if(H.gender == FEMALE) | ||
uniform = /obj/item/clothing/under/rank/security/cadet/assistant/skirt | ||
if("Security Graduate") | ||
head = /obj/item/clothing/head/beret/sec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
/datum/nttc_configuration/New() | ||
. = ..() | ||
var/list/job_radio_dict = list() | ||
|
||
for(var/i in get_all_medical_novice_tittles()) | ||
job_radio_dict.Add(list("[i]" = "medradio")) | ||
for(var/i in get_all_security_novice_tittles()) | ||
job_radio_dict.Add(list("[i]" = "secradio")) | ||
for(var/i in get_all_engineering_novice_tittles()) | ||
job_radio_dict.Add(list("[i]" = "engradio")) | ||
for(var/i in get_all_science_novice_tittles()) | ||
job_radio_dict.Add(list("[i]" = "scirradio")) | ||
|
||
all_jobs |= job_radio_dict |
Binary file not shown.