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 ec539cd commit 4186745
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 7 deletions.
1 change: 1 addition & 0 deletions modular_ss220/prime_only/_prime.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "code/clothing/under.dm"
#include "code/clothing/suits.dm"
#include "code/clothing/head.dm"
#include "code/clothing/mask.dm"
#include "code/megafauna.dm"
#include "code/objects.dm"
#include "code/outfit.dm"
Expand Down
10 changes: 9 additions & 1 deletion modular_ss220/prime_only/code/clothing/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
name = "берет начальника подразделения ''Синий Щит''"
desc = "Отличительный берет начальника локальным подразделением ''Синий Щит''. Выполнен в традиционных для компании цветах."
icon = 'modular_ss220/prime_only/icons/object/head.dmi'
icon_state = "blueshield_chef_beret"
icon_override = 'modular_ss220/prime_only/icons/mob/head.dmi'
icon_state = "blueshield_chef_beret"

/obj/item/clothing/head/helmet/space/hardsuit/midnight_suit
name = "\improper шлем"
Expand All @@ -17,3 +17,11 @@
item_color = "midnightsuit"
slowdown = 0
armor = list(MELEE = 115, BULLET = 115, LASER = 65, ENERGY = 40, BOMB = 200, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)

/obj/item/clothing/head/soft/midnight_cap
name = "чёрно-красная кепка"
desc = "Обычная кепка чёрно-красной расцветки. Круто!"
icon = 'modular_ss220/prime_only/icons/object/head.dmi'
icon_override = 'modular_ss220/prime_only/icons/mob/head.dmi'
icon_state = "midnightsoft"
item_color = "midnight"
8 changes: 8 additions & 0 deletions modular_ss220/prime_only/code/clothing/mask.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// MARK: Mask

/obj/item/clothing/mask/breath/breathscarf/midnight
name = "красный шарф с системой дыхания"
desc = "Стильный и инновационный шарф красного цвета, который служит дыхательной маской в экстремальных ситуациях."
icon = 'modular_ss220/prime_only/icons/object/mask.dmi'
icon_override = 'modular_ss220/prime_only/icons/mob/mask.dmi'
icon_state = "midnightscarf"
10 changes: 5 additions & 5 deletions modular_ss220/prime_only/code/clothing/suits.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// MARK: Coats

/obj/item/clothing/suit/browntrenchcoat/midnight_coat
/obj/item/clothing/suit/midnight_coat
name = "потрёпанное пальто"
desc = "Чёрное пальто с меховым воротником, подкладка которого подшита плотным слоем дюраткани. На внутренней стороне имеется нашивка в виде букв ''M.B.'', вплетенных в символ звезды."
icon = 'modular_ss220/prime_only/icons/object/suits.dmi'
icon_state = "midnight_coat_open"
icon_state = "midnight_coat"
icon_override = 'modular_ss220/prime_only/icons/mob/suits.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
Expand Down Expand Up @@ -42,15 +42,15 @@
else
user.alpha = initial(user.alpha)

/obj/item/clothing/suit/browntrenchcoat/midnight_coat/Initialize(mapload)
/obj/item/clothing/suit/midnight_coat/Initialize(mapload)
. = ..()
stealth_action = new(src)

/obj/item/clothing/suit/browntrenchcoat/midnight_coat/Destroy()
/obj/item/clothing/suit/midnight_coat/Destroy()
QDEL_NULL(stealth_action)
return ..()

/obj/item/clothing/suit/browntrenchcoat/midnight_coat/item_action_slot_check(slot, mob/user)
/obj/item/clothing/suit/midnight_coat/item_action_slot_check(slot, mob/user)
. = ..()
if(slot == SLOT_HUD_OUTER_SUIT)
return TRUE
Expand Down
59 changes: 58 additions & 1 deletion modular_ss220/prime_only/code/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
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/ammo_box/speed_loader_mm127 = 3,
/obj/item/clothing/accessory/holster,
)

Expand Down Expand Up @@ -229,6 +229,11 @@
head = /obj/item/clothing/head/beret/centcom/officer/blueshield_chef
gloves = /obj/item/clothing/gloves/color/white
l_pocket = /obj/item/dualsaber/legendary_saber/eris_star
backpack_contents = list(
/obj/item/gun/projectile/automatic/pistol/beretta,
/obj/item/ammo_box/magazine/beretta/mm919 = 3,
/obj/item/clothing/accessory/holster,
)

/datum/outfit/job/admin/ntnavyofficer/field/operational_officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
Expand Down Expand Up @@ -299,3 +304,55 @@
I.rank = "Nanotrasen Navy Officer"
I.assignment = "Information Security Chief"
H.sec_hud_set_ID()

/datum/outfit/job/admin/syndicate
name = "Syndicate Agent"

uniform = /obj/item/clothing/under/syndicate
back = /obj/item/storage/backpack
belt = /obj/item/storage/belt/utility/full/multitool
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/radio/headset/syndicate
id = /obj/item/card/id/syndicate
r_pocket = /obj/item/radio/uplink
backpack_contents = list(
/obj/item/storage/box/engineer = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1,
/obj/item/food/syndidonkpocket = 1
)

var/id_icon = "syndie"
var/id_access = "Syndicate Operative"
var/uplink_uses = 100

/datum/outfit/admin/syndicate/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_syndicate_access(id_access), name, id_icon)

var/obj/item/radio/uplink/U = H.r_store
if(istype(U))
U.hidden_uplink.uplink_owner = "[H.key]"
U.hidden_uplink.uses = uplink_uses

var/obj/item/radio/R = H.l_ear
if(istype(R))
R.set_frequency(SYND_FREQ)
H.faction += "syndicate"

/datum/outfit/job/admin/syndicate/midnight
name = "Midnight Agent"
uniform = /obj/item/clothing/under/midnight_under
belt = /obj/item/storage/belt/utility/full/multitool
suit = /obj/item/clothing/suit/midnight_coat
l_pocket = /obj/item/dualsaber/legendary_saber
mask = /obj/item/clothing/mask/breath/breathscarf/midnight
head = /obj/item/clothing/head/soft/midnight_cap

uplink_uses = 250
Binary file modified modular_ss220/prime_only/icons/mob/head.dmi
Binary file not shown.
Binary file added modular_ss220/prime_only/icons/mob/mask.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/object/head.dmi
Binary file not shown.
Binary file added modular_ss220/prime_only/icons/object/mask.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/object/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/prime_only/icons/object/under.dmi
Binary file not shown.

0 comments on commit 4186745

Please sign in to comment.