Skip to content

Commit

Permalink
доп меч, аутфиты по модели карчеса, фиксы, правки
Browse files Browse the repository at this point in the history
  • Loading branch information
konushi committed Nov 10, 2024
1 parent eb874b3 commit ea16231
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 40 deletions.
Binary file added modular_ss220/prime_only/aar_saberhit.mp3
Binary file not shown.
Binary file added modular_ss220/prime_only/aar_saberoff.mp3
Binary file not shown.
Binary file added modular_ss220/prime_only/aar_saberon.mp3
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_ss220/prime_only/code/clothing/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

/obj/item/clothing/suit/browntrenchcoat/blueshield_chef
name = "одеяния начальника подразделения ''Синий Щит''"
desc = "Мундир командиров локальных подразделений ''Синий Щит'', контролирующих работу сотрудников как с Административных Объектов Нанотрейзен, так и непосредственно на местах. \
desc = "Мундир командиров локальных подразделений ''Синий Щит'' контролирующих работу сотрудников как с Административных Объектов Нанотрейзен, так и непосредственно на местах. \
Как правило, его носители имеют старшее офицерское звание как в организации ''Щитов'', так и во флоте компании."
icon = 'modular_ss220/prime_only/icons/object/suits.dmi'
icon_state = "kandros_coat"
Expand Down
30 changes: 21 additions & 9 deletions modular_ss220/prime_only/code/objects.dm

Large diffs are not rendered by default.

68 changes: 38 additions & 30 deletions modular_ss220/prime_only/code/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel_norm

/datum/outfit/admin/tanya
name = "Дельта 817 - экипировка АРГ"
/datum/outfit/job/admin/tanya
name = "Delta 817 - ARG, no armor"
uniform = /obj/item/clothing/under/solgov/srt
belt = /obj/item/storage/belt/military/assault/srt
shoes = /obj/item/clothing/shoes/jackboots
Expand All @@ -20,6 +20,7 @@
r_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
back = /obj/item/storage/backpack/security
pda = /obj/item/pda/centcom
id = /obj/item/card/id/centcom
backpack_contents = list(
/obj/item/storage/box/responseteam,
/obj/item/storage/box/flashbangs,
Expand All @@ -40,7 +41,7 @@
/obj/item/organ/internal/eyes/cybernetic/xray/hardened,
)

/datum/outfit/admin/tanya/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/admin/tanya/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand All @@ -52,12 +53,12 @@
I.assignment = "Normandy Special Forces"
H.sec_hud_set_ID()

/datum/outfit/admin/tanya/tanya2
name = "Дельта 817 - экипировка АРГ в броне"
/datum/outfit/job/admin/tanya/tanya2
name = "Delta 817 - ARG, armor"
back = /obj/item/mod/control/pre_equipped/responsory/commander

/datum/outfit/admin/tanya/tanya3
name = "Дельта 817 - экипировка NF10 в броне"
/datum/outfit/job/admin/tanya/tanya3
name = "Delta 817 - NF10, armor"
back = /obj/item/mod/control/pre_equipped/responsory/commander
backpack_contents = list(
/obj/item/storage/box/responseteam,
Expand All @@ -70,8 +71,8 @@
/obj/item/gun/projectile/automatic/proto
)

/datum/outfit/admin/tanya/tanya4
name = "Дельта 817 - экипировка пулемет в броне"
/datum/outfit/job/admin/tanya/tanya4
name = "Delta 817 - l6saw, armor"
back = /obj/item/mod/control/pre_equipped/apocryphal
r_hand = /obj/item/gun/projectile/automatic/l6_saw
backpack_contents = list(
Expand All @@ -84,8 +85,8 @@
/obj/item/shield/energy,
)

/datum/outfit/admin/tanya/tanya5
name = "Дельта 817 - экипировка IK в броне"
/datum/outfit/job/admin/tanya/tanya5
name = "Delta 817 - IK-M2, armor"
back = /obj/item/mod/control/pre_equipped/responsory/security
r_hand = /obj/item/gun/projectile/automatic/lasercarbine
backpack_contents = list(
Expand All @@ -98,8 +99,8 @@
/obj/item/shield/energy,
)

/datum/outfit/admin/tanya/tanya6
name = "Дельта 817 - экипировка пульсовая в броне"
/datum/outfit/job/admin/tanya/tanya6
name = "Delta 817 - pulse, armor"
back = /obj/item/mod/control/pre_equipped/apocryphal
r_hand = /obj/item/shield/energy
backpack_contents = list(
Expand All @@ -111,8 +112,8 @@
/obj/item/gun/energy/pulse
)

/datum/outfit/job/ntspecops/normandy
name = "Мунивёрс Нормандия"
/datum/outfit/job/admin/ntspecops/normandy
name = "SOO Normandy"
suit = /obj/item/clothing/suit/space/deathsquad/officer/soo_brown
l_pocket = /obj/item/dualsaber/legendary_saber/sister
cybernetic_implants = list(
Expand All @@ -125,15 +126,16 @@
/obj/item/bio_chip/mindshield
)

/datum/outfit/job/ntnavyofficer/traisen
name = "Генрих Трейзен"
/datum/outfit/job/admin/ntnavyofficer/traisen
name = "Heinrich Traisen III"
r_hand = /obj/item/storage/belt/sheath/saber/cane_rapier
head = /obj/item/clothing/head/ntrep
mask = /obj/item/clothing/mask/gas/navy_officer
suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
back = /obj/item/storage/backpack/satchel

/datum/outfit/job/ntnavyofficer/traisen/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)

/datum/outfit/job/admin/ntnavyofficer/traisen/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand All @@ -145,21 +147,26 @@
I.assignment = "Nanotrasen Chief Executive Officer"
H.sec_hud_set_ID()

/datum/outfit/job/ntnavyofficer/field/sharlotta
name = "Дитерхис"
/datum/outfit/job/admin/ntnavyofficer/field/sharlotta
name = "Central HR Officer"
suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
l_pocket = /obj/item/dualsaber/legendary_saber/flame
gloves = /obj/item/clothing/gloves/color/white
uniform = /obj/item/clothing/under/rank/procedure/representative

/datum/outfit/job/ntnavyofficer/field/gromov
name = "Громов"
/datum/outfit/job/admin/ntnavyofficer/field/gromov
name = "Special Operations Secretary"
l_pocket = /obj/item/dualsaber/legendary_saber/sorrow_catcher
head = /obj/item/clothing/head/helmet/space/deathsquad/beret
mask = /obj/item/clothing/mask/breath/breathscarf
suit = /obj/item/clothing/suit/space/deathsquad/officer/field
backpack_contents = list(
/obj/item/gun/projectile/revolver/reclinable/rsh12,
/obj/item/ammo_box/speed_loader_mm127,
/obj/item/clothing/accessory/holster,
)

/datum/outfit/job/ntnavyofficer/field/gromov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/admin/ntnavyofficer/field/gromov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand All @@ -171,18 +178,19 @@
I.assignment = "Special Operations Secretary"
H.sec_hud_set_ID()

/datum/outfit/job/ntnavyofficer/field/fane
name = "Фейн"
/datum/outfit/job/admin/ntnavyofficer/field/fane
name = "NT Navy Officer alt. Cloak gold, scarf"
suit = /obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/gold
mask = /obj/item/clothing/mask/breath/breathscarf

/datum/outfit/job/ntnavyofficer/field/candros
name = "Кандрос"
/datum/outfit/job/admin/ntnavyofficer/field/candros
name = "Operational Group Commander"
suit = /obj/item/clothing/suit/browntrenchcoat/blueshield_chef
mask = /obj/item/clothing/mask/gas/navy_officer
head = /obj/item/clothing/head/beret/centcom/officer/blueshield_chef
gloves = /obj/item/clothing/gloves/color/white

/datum/outfit/job/ntnavyofficer/field/candros/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/admin/ntnavyofficer/field/candros/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand All @@ -194,8 +202,8 @@
I.assignment = "Operational Group Commander"
H.sec_hud_set_ID()

/datum/outfit/job/ntnavyofficer/field/rizu
name = "Рицу"
/datum/outfit/job/admin/ntnavyofficer/field/rizu
name = "NT Navy Officer alt. Hat, m1911, cane"
suit = /obj/item/clothing/suit/space/deathsquad/officer
uniform = /obj/item/clothing/under/pants/classicjeans
head = /obj/item/clothing/head/cowboyhat
Expand Down
Binary file modified modular_ss220/prime_only/icons/saber.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/saber_left.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/saber_right.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit ea16231

Please sign in to comment.