diff --git a/modular_ss220/prime_only/code/objects.dm b/modular_ss220/prime_only/code/objects.dm index 14b7e7c4b540..2d13d01f81af 100644 --- a/modular_ss220/prime_only/code/objects.dm +++ b/modular_ss220/prime_only/code/objects.dm @@ -42,7 +42,7 @@ var/hit_unwield = "swing_hit" var/ranged = FALSE var/power = 1 - var/refusal_text = "Злоба неподвластна твоей воле, усмрить её сможет лишь сильнейший." + var/refusal_text = "Злоба неподвластна твоей воле, усмирить её сможет лишь сильнейший." var/datum/enchantment/enchant = new/datum/enchantment/dash /obj/item/dualsaber/legendary_saber/Initialize(mapload) @@ -106,12 +106,13 @@ hit_wield = 'modular_ss220/prime_only/sound/weapons/kir_saberhit.ogg' /obj/item/dualsaber/legendary_saber/sister - name = "Сестра" + name = "Светлая Сестра" desc = "\"Светлая Сестра\" - один из легендарных энергетических мечей Галактики. Имеет крайне редкий кристалл с ярко-белым, \"светлым\" свечением. Меч явно создавался под женскую руку и имеет прекрасный баланс. По легендам, в свое время этим мечом был сражен один из лидеров Синдиката - \"Красавка\". \nТекущий Владелец: Мунивёрс Нормандия." icon_state = "norm_dualsaber0" blade_color = "normandy" refusal_text = "Ты не принадлежишь Сестре, верни её законному владельцу." - colormap = LIGHT_COLOR_HOLY_MAGIC + colormap = LIGHT_COLOR_HALOGEN + brightness_on = 3 saber_name = "norm" wieldsound = 'modular_ss220/prime_only/sound/weapons/norm_saberon.ogg' unwieldsound = 'modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg' diff --git a/modular_ss220/prime_only/code/outfit.dm b/modular_ss220/prime_only/code/outfit.dm index faa7a17ed4fa..26765eba0a44 100644 --- a/modular_ss220/prime_only/code/outfit.dm +++ b/modular_ss220/prime_only/code/outfit.dm @@ -116,6 +116,11 @@ name = "SOO Normandy" suit = /obj/item/clothing/suit/space/deathsquad/officer/soo_brown l_pocket = /obj/item/dualsaber/legendary_saber/sister + backpack_contents = list( + /obj/item/gun/projectile/revolver/mateba, + /obj/item/ammo_box/a357 = 3, + /obj/item/clothing/accessory/holster, + ) cybernetic_implants = list( /obj/item/organ/internal/eyes/cybernetic/xray/hardened, /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened, @@ -148,12 +153,24 @@ H.sec_hud_set_ID() /datum/outfit/job/admin/ntnavyofficer/field/hr_officer - name = "Central HR Officer" + name = "Chief 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/admin/ntnavyofficer/field/hr_officer/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"), "Chief HR Officer") + I.rank = "Nanotrasen Navy Officer" + I.assignment = "Chief HR Officer" + H.sec_hud_set_ID() + /datum/outfit/job/admin/ntnavyofficer/field/secretary_officer name = "Special Operations Secretary" l_pocket = /obj/item/dualsaber/legendary_saber/sorrow_catcher @@ -222,8 +239,8 @@ I.assignment = "Operational Group Commander" H.sec_hud_set_ID() -/datum/outfit/job/admin/ntnavyofficer/field/alt3 - name = "NT Navy Officer alt. Hat, m1911, cane" +/datum/outfit/job/admin/ntnavyofficer/field/counterintelligence + name = "Counterintelligence Chief Officer" suit = /obj/item/clothing/suit/space/deathsquad/officer uniform = /obj/item/clothing/under/pants/classicjeans head = /obj/item/clothing/head/cowboyhat @@ -241,6 +258,18 @@ /obj/item/flashlight/seclite ) +/datum/outfit/job/admin/ntnavyofficer/field/counterintelligence/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"), "Counterintelligence Chief Officer") + I.rank = "Nanotrasen Navy Officer" + I.assignment = "Counterintelligence Chief Officer" + H.sec_hud_set_ID() + /obj/item/storage/belt/military/assault/m1911/populate_contents() new /obj/item/ammo_box/magazine/m45 (src) new /obj/item/ammo_box/magazine/m45 (src) @@ -248,3 +277,21 @@ new /obj/item/ammo_box/magazine/m45 (src) new /obj/item/ammo_box/magazine/m45 (src) new /obj/item/ammo_box/magazine/m45 (src) + +/datum/outfit/job/admin/ntnavyofficer/field/information_security + name = "Information Security Chief" + suit = /obj/item/clothing/suit/armor/hos + mask = /obj/item/clothing/mask/gas/navy_officer + l_pocket = /obj/item/dualsaber/legendary_saber/devotion + +/datum/outfit/job/admin/ntnavyofficer/field/information_security/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"), "Information Security Chief") + I.rank = "Nanotrasen Navy Officer" + I.assignment = "Information Security Chief" + H.sec_hud_set_ID() diff --git a/modular_ss220/prime_only/icons/saber.dmi b/modular_ss220/prime_only/icons/saber.dmi index 7e767a579cab..9ded5a97c8ee 100644 Binary files a/modular_ss220/prime_only/icons/saber.dmi and b/modular_ss220/prime_only/icons/saber.dmi differ diff --git a/modular_ss220/prime_only/icons/saber_left.dmi b/modular_ss220/prime_only/icons/saber_left.dmi index ce480ada556c..150a1685a113 100644 Binary files a/modular_ss220/prime_only/icons/saber_left.dmi and b/modular_ss220/prime_only/icons/saber_left.dmi differ diff --git a/modular_ss220/prime_only/icons/saber_right.dmi b/modular_ss220/prime_only/icons/saber_right.dmi index 79d65b2706b7..bbf0b8d55a47 100644 Binary files a/modular_ss220/prime_only/icons/saber_right.dmi and b/modular_ss220/prime_only/icons/saber_right.dmi differ diff --git a/modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg b/modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg index 5470dd8bf5db..8841fd36aaca 100644 Binary files a/modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg and b/modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg differ diff --git a/modular_ss220/prime_only/sound/weapons/norm_saberon.ogg b/modular_ss220/prime_only/sound/weapons/norm_saberon.ogg index a1a85d25428d..6c537817ce17 100644 Binary files a/modular_ss220/prime_only/sound/weapons/norm_saberon.ogg and b/modular_ss220/prime_only/sound/weapons/norm_saberon.ogg differ