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.

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

Дополнительная менюшка в выборе снаряжения для админов. #1570

Merged
merged 14 commits into from
Oct 3, 2024
18 changes: 16 additions & 2 deletions code/modules/admin/verbs/debug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/list/special_outfits = list(
"Naked",
"As Job...",
"As Admin Job...", //SS220 EDIT - Добавил "As Admin Job..."
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
"Custom..."
)

var/list/outfits = list()
var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) - list(/datum/outfit/varedit, /datum/outfit/admin)
var/list/paths = subtypesof(/datum/outfit) - typesof(/datum/outfit/job) - list(/datum/outfit/varedit, /datum/outfit/admin) - typesof(/datum/outfit/job/admin) // SS220 EDIT - subtract typesof(/datum/outfit/job/admin)
for(var/path in paths)
var/datum/outfit/O = path //not much to initalize here but whatever
if(initial(O.can_be_admin_equipped))
Expand All @@ -688,7 +688,21 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
dresscode = job_outfits[dresscode]
if(isnull(dresscode))
return
// SS220 EDIT START - собственно сама менюшка
if(dresscode == "As Admin Job...")
var/list/admin_job_paths = subtypesof(/datum/outfit/job/admin)
var/list/admin_job_outfits = list()
for(var/path in admin_job_paths)
var/datum/outfit/O = path
if(initial(O.can_be_admin_equipped))
admin_job_outfits[initial(O.name)] = path
admin_job_outfits = sortTim(admin_job_outfits, GLOBAL_PROC_REF(cmp_text_asc))

dresscode = input("Select equipment", "Сhoose your fighter") as null|anything in admin_job_outfits
dresscode = admin_job_outfits[dresscode]
if(isnull(dresscode))
return
//SS220 EDIT END
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
if(dresscode == "Custom...")
var/list/custom_names = list()
for(var/datum/outfit/D in GLOB.custom_outfits)
Expand Down
5 changes: 5 additions & 0 deletions modular_ss220/clothing/code/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,8 @@
/obj/item/clothing/head/towel/brown
name = "коричневая шапочка из полотенца"
color = "#DEB887"

/obj/item/clothing/head/beret/centcom/intern
name = "nanotrasen intern beret"
desc = "Берет стажера НТ. Белый берет с зеленой звездой. Выглядит подозрительно похожим на берет главного инженера..."
icon_state = "beret_ce"
14 changes: 14 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,20 @@
desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
icon_state = "ntsc_coat"

/obj/item/clothing/under/rank/centcom/intern
name = "nanotrasen intern uniform"
desc = "Стандартная униформа стажера НТ. Обладает не самым хорошим качеством, однако вполне сгодится для удовлетворения амбиций стажера. В комплекте идёт зеленый галстук. Слава НТ!"
icon = 'icons/obj/clothing/under/procedure.dmi'
icon_state = "iaa"
item_state = "iaa"
item_color = "iaa"
sprite_sheets = list(
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
"Human" = 'icons/mob/clothing/under/procedure.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/procedure.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/procedure.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/procedure.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/procedure.dmi'
)
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
/* SYNDICATE */
/obj/item/clothing/suit/space/deathsquad/officer/syndie
name = "куртка офицера синдиката"
Expand Down
198 changes: 194 additions & 4 deletions modular_ss220/outfits/code/outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,111 @@
/obj/item/clothing/head/beret/centcom/officer/navy/marine
name = "navy blue beret"

// MARK: NT Navy Field Officer
/datum/outfit/job/ntnavyofficer/field
// MARK: NT Officer outfits
/datum/outfit/job/admin/ntnavyofficer
name = "Nanotrasen Navy Officer"
jobtype = /datum/job/ntnavyofficer

uniform = /obj/item/clothing/under/rank/centcom/officer
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/centcom
head = /obj/item/clothing/head/beret/centcom/officer
l_ear = /obj/item/radio/headset/centcom
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
bio_chips = list(
/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/dust
)
backpack = /obj/item/storage/backpack/satchel
backpack_contents = list(
/obj/item/stamp/centcom = 1,
)
box = /obj/item/storage/box/centcomofficer
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened,
/obj/item/organ/internal/cyberimp/arm/combat/centcom
)

/datum/outfit/job/admin/ntnavyofficer/on_mind_initialize(mob/living/carbon/human/H)
. = ..()
H.mind.offstation_role = TRUE

Kar4es marked this conversation as resolved.
Show resolved Hide resolved
/datum/outfit/job/admin/ntspecops
name = "Special Operations Officer"
jobtype = /datum/job/ntspecops
allow_backbag_choice = FALSE
uniform = /obj/item/clothing/under/rank/centcom/captain
suit = /obj/item/clothing/suit/space/deathsquad/officer
belt = /obj/item/storage/belt/military/assault
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
mask = /obj/item/clothing/mask/holo_cigar
head = /obj/item/clothing/head/helmet/space/deathsquad/beret
l_ear = /obj/item/radio/headset/centcom
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
r_pocket = /obj/item/storage/fancy/matches
back = /obj/item/storage/backpack/satchel
box = /obj/item/storage/box/centcomofficer
backpack_contents = list(
/obj/item/clothing/shoes/magboots/advance = 1,
/obj/item/storage/box/zipties = 1
)
bio_chips = list(
/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/eyes/cybernetic/xray/hardened,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened,
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened,
/obj/item/organ/internal/cyberimp/arm/combat/centcom
)

/datum/outfit/job/admin/ntspecops/on_mind_initialize(mob/living/carbon/human/H)
. = ..()
H.mind.offstation_role = TRUE

Kar4es marked this conversation as resolved.
Show resolved Hide resolved
/datum/outfit/job/admin/ntspecops/mooniverse
name = "Specops Mooniverse"
suit = /obj/item/clothing/suit/space/deathsquad/officer/soo_brown
backpack_contents = list(
/obj/item/clothing/shoes/magboots/advance,
/obj/item/gun/projectile/revolver/mateba,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/clothing/accessory/holster
)
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
Kar4es marked this conversation as resolved.
Show resolved Hide resolved

/datum/outfit/job/admin/ntspecops/alt
name = "Specops alt. RSH-12, saber, bandana."
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
belt = /obj/item/storage/belt/sheath/saber
backpack_contents = list(
/obj/item/gun/projectile/revolver/reclinable/rsh12,
/obj/item/ammo_box/speed_loader_mm127,
/obj/item/ammo_box/speed_loader_mm127,
/obj/item/ammo_box/speed_loader_mm127,
/obj/item/clothing/mask/bandana/red
)
suit_store = /obj/item/ammo_box/box_mm127

/datum/outfit/job/admin/ntnavyofficer/alt
name = "NT Navy Officer alt. Coat NT, holo, nooble, cane."
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
mask = /obj/item/clothing/mask/holo_cigar
suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt
shoes = /obj/item/clothing/shoes/fluff/noble_boot
belt = /obj/item/melee/classic_baton/ntcane

/datum/outfit/job/admin/ntnavyofficer/alt2
name = "NT Navy Officer alt. Cloak NT, holo."
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
mask = /obj/item/clothing/mask/holo_cigar

/datum/outfit/job/admin/ntnavyofficer/field
name = "Nanotrasen Navy Field Officer"

gloves = /obj/item/clothing/gloves/combat
Expand All @@ -56,15 +159,102 @@
/obj/item/organ/internal/eyes/cybernetic/thermals/hardened
)

/datum/outfit/job/ntnavyofficer/field/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/admin/ntnavyofficer/field/alt
name = "Nanotrasen Navy Field Officer alt. Ring, mateba, holster."
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
gloves =/obj/item/clothing/gloves/ring/silver
mask = /obj/item/clothing/mask/holo_cigar
backpack_contents = list(
/obj/item/clothing/accessory/scarf/purple,
/obj/item/clothing/gloves/combat,
/obj/item/gun/projectile/revolver/mateba,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/clothing/accessory/holster
)

/datum/outfit/job/admin/nt_navy_captain
name = "NT Navy Captain (Advanced)"

uniform = /obj/item/clothing/under/rank/centcom/captain
back = /obj/item/storage/backpack/satchel
belt = /obj/item/storage/belt/sheath/saber
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/centcom
head = /obj/item/clothing/head/beret/centcom/captain
l_ear = /obj/item/radio/headset/centcom
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
backpack_contents = list(
/obj/item/storage/box/centcomofficer,
/obj/item/bio_chip_implanter/death_alarm,
/obj/item/stamp/centcom,
/obj/item/gun/projectile/revolver/reclinable/rsh12,
/obj/item/ammo_box/speed_loader_mm127,
/obj/item/ammo_box/speed_loader_mm127
)
bio_chips = list(
/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/eyes/cybernetic/xray/hardened,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened,
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened
)
Kar4es marked this conversation as resolved.
Show resolved Hide resolved

/datum/outfit/job/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return

var/obj/item/card/id/I = H.wear_id
if(istype(I))
apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Captain"), "Nanotrasen Navy Captain")
H.sec_hud_set_ID()

/datum/outfit/job/admin/ntnavyofficer/field/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
H.mind.offstation_role = TRUE
var/obj/item/card/id/I = H.wear_id
if(istype(I))
apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen Navy Field Officer")
I.assignment = "Nanotrasen Navy Officer"
I.rank = "Nanotrasen Navy Officer"
I.assignment = "Nanotrasen Navy Field Officer"
H.sec_hud_set_ID()

/datum/outfit/job/admin/ntnavyofficer/intern
name = "NT Intern"
uniform = /obj/item/clothing/under/rank/centcom/intern
head = /obj/item/clothing/head/beret/centcom/intern
glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
gloves = /obj/item/clothing/gloves/fingerless
id = /obj/item/card/id/centcom
backpack_contents = list(
/obj/item/stamp/centcom,
/obj/item/clipboard,
/obj/item/stack/spacecash/c200
)
bio_chips = list(
/obj/item/bio_chip/mindshield
)
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened
)

/datum/outfit/job/admin/ntnavyofficer/intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return

var/obj/item/card/id/I = H.wear_id
if(istype(I))
apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen CentCom Intern")
I.rank= "Nanotrasen Navy Officer"
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
I.assignment = "Nanotrasen CentCom Intern"
H.sec_hud_set_ID()

/obj/item/clothing/head/helmet/space/deathsquad/beret/field
Expand Down
Loading