Skip to content

Commit

Permalink
Feat: update ERT sprites (#629)
Browse files Browse the repository at this point in the history
# Описание

Ультимативное обновление Пауэр Рейнджеров. Теперь их стандартная броня
не кринж и в ней даже не стыдно выезжать на Сьерру. Спрайты от @honkemo.
Дополнительно им были добавлены балаклавы, противогазы заменены на
SWAT-версию. Была изменена униформа, добавлены особые ЕРТ-патчи,
заменены аксессуары, обозначающие специализацию, на свои собственные.

## Скриншоты


![image](https://github.com/ss220-space/Baystation12/assets/83385197/92f19eb7-6bb9-4af9-ba82-8532300598e3)

## Changelog

<!-- С помощью этого раздела можно подготовить список изменений, которые
попадут в игровой чейндж-лог. --->
<!-- Вам нужно указать префикс изменения (Он идёт до двоеточия) и дать
описание, как на примере. --->
<!-- Префиксы можно использовать несколько раз. --->
<!-- Если Вы не планируете добавлять записи в чейндж-лог - просто
удалите из пулл-реквеста этот раздел. --->

:cl: Neonvolt, Gfitkiilt
bugfix: removed army and fleet branch blacklist for machines
bugfix: fixed tajaran sec alt voidsuit helmet sprite
imageadd: added new ERT armor and patches sprites
imagedel: deleted some icons and images
maptweak: edited ERT base map and equipment on it
bugfix: fixed HoS hardsuit module having wrong back sprite
/:cl:
  • Loading branch information
Neonvolt authored Oct 3, 2023
1 parent 44cf568 commit 0122478
Show file tree
Hide file tree
Showing 16 changed files with 248 additions and 195 deletions.
8 changes: 4 additions & 4 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@

//Non-hardsuit ERT helmets.
//Commander
/obj/item/clothing/head/helmet/ert
/obj/item/clothing/head/helmet/riot/ert
name = "asset protection command helmet"
desc = "An in-atmosphere helmet worn by many corporate and private asset protection forces. Has blue highlights."
icon_state = "erthelmet_cmd"
Expand All @@ -202,19 +202,19 @@
)

//Security
/obj/item/clothing/head/helmet/ert/security
/obj/item/clothing/head/helmet/riot/ert/security
name = "asset protection security helmet"
desc = "An in-atmosphere helmet worn by many corporate and private asset protection forces. Has red highlights."
icon_state = "erthelmet_sec"

//Engineer
/obj/item/clothing/head/helmet/ert/engineer
/obj/item/clothing/head/helmet/riot/ert/engineer
name = "asset protection engineering helmet"
desc = "An in-atmosphere helmet worn by many corporate and private asset protection forces. Has orange highlights."
icon_state = "erthelmet_eng"

//Medical
/obj/item/clothing/head/helmet/ert/medical
/obj/item/clothing/head/helmet/riot/ert/medical
name = "asset protection medical helmet"
desc = "An in-atmosphere helmet worn by many corporate and private asset protection forces. Has red and white highlights."
icon_state = "erthelmet_med"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/item_worth/worths_list.dm
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ var/list/worths = list(
/obj/item/clothing/head/helmet/gladiator = 280,
/obj/item/clothing/head/helmet/tactical = 300,
/obj/item/clothing/head/helmet/augment = 600,
/obj/item/clothing/head/helmet/ert = 1000,
/obj/item/clothing/head/helmet/riot/ert = 1000,
/obj/item/clothing/head/helmet = 250,
/obj/item/clothing/head/culthood = 150,
/obj/item/clothing/head/caphat/hop = 100,
Expand Down
Binary file modified icons/mob/onmob/onmob_accessories.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_back.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_head.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_rig_back.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_suit.dmi
Binary file not shown.
Binary file modified icons/mob/species/tajaran/helmet.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_accessories.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_head.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_suit.dmi
Binary file not shown.
13 changes: 7 additions & 6 deletions infinity/code/modules/clothing/under/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@

/obj/item/clothing/under/ert_outfit
name = "asset protection uniform"
desc = "A black camouflage uniform for NT Security Force's asset protection."
icon = 'infinity/icons/obj/clothing/obj_under.dmi'
item_icons = list(slot_w_uniform_str = 'infinity/icons/mob/onmob/onmob_under.dmi')
icon_state = "ass_protection"
item_state = "ass_protection"
worn_state = "ass_protection"
desc = "A comfortable turtleneck and utility trousers for NT Security Force's asset protection."
icon = 'maps/torch/icons/obj/obj_under_solgov.dmi'
item_icons = list(slot_w_uniform_str = 'maps/torch/icons/mob/onmob_under_solgov.dmi')
icon_state = "blackutility"
item_state = "bl_suit"
worn_state = "blackutility"
starting_accessories = list(/obj/item/clothing/accessory/ert)
armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.8

Expand Down
Binary file removed infinity/icons/mob/onmob/onmob_rig_back.dmi
Binary file not shown.
Loading

0 comments on commit 0122478

Please sign in to comment.