Skip to content

Commit

Permalink
New security helmet and coat (ss220club#1586)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->
ПР добавляет набор из трёх предметов которые можно примерить на вашей
кукле.

## Почему это хорошо для игры

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->
~~Моя звай Гламур! Я люблю делай косплеи! Нраица! Эта моя государства
Нанотразен. Он середина между СССП, ТСФ и ещё чиндикат. Здесь моя город
Кибериада. Это Вульпикс, ерпшер местный. Нехороший! А вот здесь наш
бриг. А здесь живёт СЕ с Поли, местный механько и
см-о-дестабилизаторомахер. Это моя хата. Заходи, пожалуйста! Он моя
сосед. Ассистос Серый. Боль в моя дырка задница. Я делай всё из стекла,
он тоже делай всё из стекла. Я делай баню, он тоже делай баню. Я закупай
косплей. Он не накопил. Радостно! (что только не придумаешь в 3 часа
ночи)~~
это крутой костюм. Все.

## Изображения изменений

<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

![screen1](https://github.com/user-attachments/assets/efe271df-fcd4-483b-ba14-906b11b307da)

![screen2](https://github.com/user-attachments/assets/43a0e094-bec7-4029-93d5-829f29bedebe)

![screen3](https://github.com/user-attachments/assets/518b9185-e144-4445-99ad-e2547422b2ef)
Возможно в процессе придётся изменить спрайты

## Тестирование

<!-- Как вы тестировали свой PR, если делали это вовсе? -->
протестировано на локалке, все работает

## Changelog

:cl: glamyr
add: Добавлен набор метрокопа во взломанный SecDrobe.
tweak: Одежда младшего персонала теперь доступна в вендорах отделов.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

---------

Co-authored-by: Mikhail Dzianishchyts <[email protected]>
Co-authored-by: dj-34 <[email protected]>
  • Loading branch information
3 people authored Jan 15, 2025
1 parent e30070c commit 08786ee
Show file tree
Hide file tree
Showing 19 changed files with 142 additions and 1 deletion.
74 changes: 74 additions & 0 deletions modular_ss220/clothing/code/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,77 @@
"Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
)
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 50, FIRE = 200, ACID = 115)

/obj/item/clothing/head/helmet/cop
name = "helmet of civil defend officer"
desc = "Шлем для любителей свежего воздуха. Подними эту банку!"
flags = BLOCKHAIR
flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
icon = 'modular_ss220/clothing/icons/object/helmet.dmi'
icon_state = "cop0"
item_state = "cop0"
sprite_sheets = list(
"Abductor" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/helmet.dmi',
"Human" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/species/machine/helmet.dmi',
"Monkey" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Plasmaman" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi',
)
armor = list(MELEE = 10, BULLET = 20, LASER = 10, ENERGY = 15, BOMB = 1, RAD = 0, FIRE = 50, ACID = 50)
actions_types = list(/datum/action/item_action/toggle_helmet_light)
var/on = FALSE
var/brightness_on = 2

/obj/item/clothing/head/helmet/cop/attack_self__legacy__attackchain(mob/living/user)
toggle_helmet_light(user)

/obj/item/clothing/head/helmet/cop/proc/toggle_helmet_light(mob/living/user)
on = !on
if(on)
turn_on(user)
else
turn_off(user)
update_icon(UPDATE_ICON_STATE)

/obj/item/clothing/head/helmet/cop/update_icon_state()
icon_state = "cop[on]"
item_state = "cop[on]"
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
H.update_inv_head()
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtons()

/obj/item/clothing/head/helmet/cop/proc/turn_on(mob/user)
set_light(brightness_on)

/obj/item/clothing/head/helmet/cop/proc/turn_off(mob/user)
set_light(0)

/obj/item/clothing/head/helmet/cop/extinguish_light(force = FALSE)
if(on)
on = FALSE
turn_off()
update_icon(UPDATE_ICON_STATE)
visible_message(span_danger("[src]'s light fades and turns off."))

/obj/item/clothing/head/helmet/cop/v2
icon_state = "cop1"
item_state = "cop1"
34 changes: 34 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -437,3 +437,37 @@
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/* Security */
/obj/item/clothing/suit/armor/cop
name = "grey overcoat"
desc = "Не забудьте про шлем любителя свежего воздуха."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
icon_state = "armored_coat"
item_state = "armored_coat"
armor = list(MELEE = 25, BULLET = 25, LASER = 15, ENERGY = 5, BOMB = 1, RAD = 0, FIRE = 50, ACID = 50)
body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
heat_protection = UPPER_TORSO | LOWER_TORSO | ARMS
sprite_sheets = list(
"Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/suits.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/species/grey/suits.dmi',
"Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/suits.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Monkey" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Plasmaman" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
)
Binary file modified modular_ss220/clothing/icons/mob/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/drask/suits.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/grey/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/kidan/suits.dmi
Binary file not shown.
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vox/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/helmet.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
35 changes: 34 additions & 1 deletion modular_ss220/jobs/code/objects/wardrobe_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
/obj/item/clothing/head/surgery/green/light = 5,
/obj/item/clothing/under/rank/medical/scrubs/green/light = 5,
)
prices |= list(
/obj/item/clothing/under/rank/medical/doctor/intern = 50,
/obj/item/clothing/under/rank/medical/doctor/intern/skirt = 50,
/obj/item/clothing/under/rank/medical/doctor/intern/assistant = 50,
/obj/item/clothing/under/rank/medical/doctor/intern/assistant/skirt = 50,
/obj/item/clothing/head/surgery/green/light = 20,
/obj/item/clothing/under/rank/medical/scrubs/green/light = 50,
)


/obj/machinery/economy/vending/secdrobe/Initialize(mapload)
Expand All @@ -18,6 +26,20 @@
/obj/item/clothing/under/rank/security/officer/cadet/assistant = 5,
/obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt = 5,
)
contraband |= list(
/obj/item/clothing/head/helmet/cop = 2,
/obj/item/clothing/head/helmet/cop/v2 = 1,
/obj/item/clothing/suit/armor/cop = 3,
)
prices |= list(
/obj/item/clothing/under/rank/security/officer/cadet = 50,
/obj/item/clothing/under/rank/security/officer/cadet/skirt = 50,
/obj/item/clothing/under/rank/security/officer/cadet/assistant = 50,
/obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt = 50,
/obj/item/clothing/head/helmet/cop = 200,
/obj/item/clothing/head/helmet/cop/v2 = 200,
/obj/item/clothing/suit/armor/cop = 200,
)


/obj/machinery/economy/vending/scidrobe/Initialize(mapload)
Expand All @@ -28,7 +50,12 @@
/obj/item/clothing/under/rank/rnd/scientist/student/assistant = 5,
/obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt = 5,
)

prices |= list(
/obj/item/clothing/under/rank/rnd/scientist/student = 50,
/obj/item/clothing/under/rank/rnd/scientist/student/skirt = 50,
/obj/item/clothing/under/rank/rnd/scientist/student/assistant = 50,
/obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt = 50,
)

/obj/machinery/economy/vending/engidrobe/Initialize(mapload)
. = ..()
Expand All @@ -38,3 +65,9 @@
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 5,
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 5,
)
prices |= list(
/obj/item/clothing/under/rank/engineering/engineer/trainee = 50,
/obj/item/clothing/under/rank/engineering/engineer/trainee/skirt = 50,
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 50,
/obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 50,
)

0 comments on commit 08786ee

Please sign in to comment.