Skip to content

Commit

Permalink
иконки, аутфиты, правки
Browse files Browse the repository at this point in the history
  • Loading branch information
konushi committed Nov 13, 2024
1 parent a8c52f3 commit caf64b8
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 6 deletions.
7 changes: 4 additions & 3 deletions modular_ss220/prime_only/code/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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'
Expand Down
53 changes: 50 additions & 3 deletions modular_ss220/prime_only/code/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -241,10 +258,40 @@
/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)
new /obj/item/ammo_box/magazine/m45 (src)
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()
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 modified modular_ss220/prime_only/sound/weapons/norm_saberoff.ogg
Binary file not shown.
Binary file modified modular_ss220/prime_only/sound/weapons/norm_saberon.ogg
Binary file not shown.

0 comments on commit caf64b8

Please sign in to comment.