diff --git a/modular_ss220/prime_only/_prime.dme b/modular_ss220/prime_only/_prime.dme index 8d9f7cde4eeb..cddea41de7c6 100644 --- a/modular_ss220/prime_only/_prime.dme +++ b/modular_ss220/prime_only/_prime.dme @@ -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" diff --git a/modular_ss220/prime_only/code/clothing/head.dm b/modular_ss220/prime_only/code/clothing/head.dm index aade6bf1c1fc..36c77ddf29de 100644 --- a/modular_ss220/prime_only/code/clothing/head.dm +++ b/modular_ss220/prime_only/code/clothing/head.dm @@ -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 шлем" @@ -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" diff --git a/modular_ss220/prime_only/code/clothing/mask.dm b/modular_ss220/prime_only/code/clothing/mask.dm new file mode 100644 index 000000000000..0e1762f4637e --- /dev/null +++ b/modular_ss220/prime_only/code/clothing/mask.dm @@ -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" diff --git a/modular_ss220/prime_only/code/clothing/suits.dm b/modular_ss220/prime_only/code/clothing/suits.dm index a13882e05f1e..bdaab71107d6 100644 --- a/modular_ss220/prime_only/code/clothing/suits.dm +++ b/modular_ss220/prime_only/code/clothing/suits.dm @@ -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 @@ -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 diff --git a/modular_ss220/prime_only/code/outfit.dm b/modular_ss220/prime_only/code/outfit.dm index b8cf03eade38..293d450e2fa2 100644 --- a/modular_ss220/prime_only/code/outfit.dm +++ b/modular_ss220/prime_only/code/outfit.dm @@ -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, ) @@ -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) . = ..() @@ -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 diff --git a/modular_ss220/prime_only/icons/mob/head.dmi b/modular_ss220/prime_only/icons/mob/head.dmi index 53bde4db5c85..3fbc41a6bbec 100644 Binary files a/modular_ss220/prime_only/icons/mob/head.dmi and b/modular_ss220/prime_only/icons/mob/head.dmi differ diff --git a/modular_ss220/prime_only/icons/mob/mask.dmi b/modular_ss220/prime_only/icons/mob/mask.dmi new file mode 100644 index 000000000000..2a02e7097e38 Binary files /dev/null and b/modular_ss220/prime_only/icons/mob/mask.dmi differ diff --git a/modular_ss220/prime_only/icons/mob/suits.dmi b/modular_ss220/prime_only/icons/mob/suits.dmi index 7c59d98e03d3..df2e48729a95 100644 Binary files a/modular_ss220/prime_only/icons/mob/suits.dmi and b/modular_ss220/prime_only/icons/mob/suits.dmi differ diff --git a/modular_ss220/prime_only/icons/mob/under.dmi b/modular_ss220/prime_only/icons/mob/under.dmi index bcec3e61d3b0..d1a657ef21ff 100644 Binary files a/modular_ss220/prime_only/icons/mob/under.dmi and b/modular_ss220/prime_only/icons/mob/under.dmi differ diff --git a/modular_ss220/prime_only/icons/object/head.dmi b/modular_ss220/prime_only/icons/object/head.dmi index 9c14eebab2b7..aad7ccd152e9 100644 Binary files a/modular_ss220/prime_only/icons/object/head.dmi and b/modular_ss220/prime_only/icons/object/head.dmi differ diff --git a/modular_ss220/prime_only/icons/object/mask.dmi b/modular_ss220/prime_only/icons/object/mask.dmi new file mode 100644 index 000000000000..01f3cf3ce687 Binary files /dev/null and b/modular_ss220/prime_only/icons/object/mask.dmi differ diff --git a/modular_ss220/prime_only/icons/object/suits.dmi b/modular_ss220/prime_only/icons/object/suits.dmi index b618cd6e11b8..bcfa30787d0c 100644 Binary files a/modular_ss220/prime_only/icons/object/suits.dmi and b/modular_ss220/prime_only/icons/object/suits.dmi differ diff --git a/modular_ss220/prime_only/icons/object/under.dmi b/modular_ss220/prime_only/icons/object/under.dmi index 674c65baa055..96f68f4b8b2d 100644 Binary files a/modular_ss220/prime_only/icons/object/under.dmi and b/modular_ss220/prime_only/icons/object/under.dmi differ