Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Prime-Only] Add: Prime Event outfits&clothes #1647

Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
13 changes: 10 additions & 3 deletions modular_ss220/prime_only/code/clothing/head.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// MARK: Prime Event clothes
/* HEADS */
// MARK: Heads

/obj/item/clothing/head/beret/centcom/officer/blueshield_chef
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 шлем"
konushi marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -18,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

m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
/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"
19 changes: 8 additions & 11 deletions modular_ss220/prime_only/code/clothing/suits.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// MARK: Prime Event clothes
/* COATS */
// 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'
Expand Down Expand Up @@ -43,29 +42,27 @@
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
else
user.alpha = initial(user.alpha)

/obj/item/clothing/suit/browntrenchcoat/blueshield_chef
name = "одеяния начальника подразделения ''Синий Щит''"
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
name = "одеяния начальника подразделения \"Синий Щит\""
desc = "Мундир командиров локальных подразделений ''Синий Щит'' контролирующих работу сотрудников как с Административных Объектов Нанотрейзен, так и непосредственно на местах. \
Как правило, его носители имеют старшее офицерское звание как в организации ''Щитов'', так и во флоте компании."
icon = 'modular_ss220/prime_only/icons/object/suits.dmi'
icon_state = "blueshield_chef_coat"
icon_state = "blueshield_chef_coat_open"
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 All @@ -77,7 +74,7 @@
"Drask" = 'modular_ss220/prime_only/icons/mob/species/drask/suits/suits.dmi',
)

/* HARDSUITS */
// MARK: Hardsuit
/obj/item/clothing/suit/space/hardsuit/midnight_suit
name = "\improper модернизированный элитный экзоскелет"
desc = "Экзоскелет ударной группы синдиката, модернизированный по спецзаказу Миднайта Блэка."
Expand Down
11 changes: 4 additions & 7 deletions modular_ss220/prime_only/code/clothing/under.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// MARK: Explorer's outfits
// MARK: Under

/obj/item/clothing/under/rank/cargo/expedition_prime
name = "navy expedition uniform"
Expand Down Expand Up @@ -33,19 +33,16 @@
item_state = "expedition_prime_grey"
item_color = "expedition_prime_grey"

// MARK: Prime Event clothes
/* UNDER*/

/obj/item/clothing/under/midnight_under
name = "профессиональный тактический костюм"
konushi marked this conversation as resolved.
Show resolved Hide resolved
desc = "Костюм настоящих профессионалов. Лёгкий и практичный, обладает встроенной активной терморегуляционной системой и повышенной прочностью за счет вплетенных пластитановых волокон. \
Надевая его вы чувстуете себя менее заметным."
icon = 'modular_ss220/prime_only/icons/mob/under.dmi'
Надевая его, вы чувстуете себя менее заметным."
icon = 'modular_ss220/prime_only/icons/object/under.dmi'
icon_state = "midnight_under"
item_state = "midnight_under"
item_color = "midnight_under"
sprite_sheets = list(
"Human" = 'modular_ss220/prime_only/icons/mob/under.dmi',
)
species_restricted = list("Human") // Уточню
armor = list(MELEE = 10, BULLET = 10, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 5, ACID = 50)

65 changes: 63 additions & 2 deletions modular_ss220/prime_only/code/outfit.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// MARK: Prime outfits
// MARK: Explorer

/datum/outfit/job/explorer
uniform = /obj/item/clothing/under/rank/cargo/expedition_prime
head = /obj/item/clothing/head/soft/black
backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel_norm

// MARK: Event outfits

/datum/outfit/job/admin/delta817
name = "Delta 817 - ARG, no armor"
uniform = /obj/item/clothing/under/solgov/srt
Expand Down Expand Up @@ -179,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 All @@ -194,6 +196,7 @@
var/datum/spell/flayer/S = new spell_path
S.level = S.max_level
S.cooldown_handler.recharge_duration = S.base_cooldown / 5
S.requiers_antag_datum = FALSE
H.mind.AddSpell(S)

//summon sword
Expand Down Expand Up @@ -226,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 @@ -277,6 +285,7 @@
new /obj/item/ammo_box/magazine/m45 (src)
new /obj/item/ammo_box/magazine/m45 (src)
new /obj/item/ammo_box/magazine/m45 (src)
update_icon()

/datum/outfit/job/admin/ntnavyofficer/field/information_security
name = "Information Security Chief"
Expand All @@ -295,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
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
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"
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
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
m-dzianishchyts marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 5 additions & 2 deletions modular_ss220/prime_only/code/spells.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/datum/spell_handler/flayer/can_cast(mob/user, charge_check, show_message, datum/spell/spell)
if(user.mind.offstation_role == 1)
/datum/spell/flayer
var/requiers_antag_datum = TRUE

/datum/spell_handler/flayer/can_cast(mob/user, charge_check, show_message, datum/spell/flayer/spell)
if(!spell.requiers_antag_datum)
return TRUE
return ..()

Expand Down
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.
Loading