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

Medic & Engineer voidsuits #2094

Merged
merged 24 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all 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 baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3422,6 +3422,7 @@
#include "mods\_master_files\code\game\gamemodes\ert.dm"
#include "mods\_master_files\code\game\objects\effects\decals\contraband.dm"
#include "mods\_master_files\code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
#include "mods\_master_files\code\modules\clothing\voidsuits.dm"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а разве это не должно быть в mods/ex_rigs/_ex_rigs.dme ?

Copy link
Author

@ddorou ddorou Apr 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Если не ошибаюсь, то не должнo. В mods/ex_rigs/_ex_rigs.dme находится тот код, который должен быть написан в mods/ex_rigs/code, но т.к такого нет, то и mods/ex_rigs/_ex_rigs.dme пустой. Как я видел по примерам других модов, мастерфайлы инклюдятся в baystation12.dme

#include "mods\_master_files\code\modules\clothing\spacesuits\spacesuits.dm"
#include "mods\_master_files\code\modules\culture_descriptor\_culture.dm"
#include "mods\_master_files\code\modules\culture_descriptor\culture\cultures_adherent.dm"
Expand Down
Binary file modified maps/sierra/icons/mob/onmob/onmob_head.dmi
Binary file not shown.
Binary file modified maps/sierra/icons/mob/onmob/onmob_suit.dmi
Binary file not shown.
Binary file modified maps/sierra/icons/obj/clothing/obj_suit.dmi
Binary file not shown.
22 changes: 22 additions & 0 deletions maps/sierra/machinery/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,28 @@
islocked = 1
ssu_color = "#990000"

/obj/machinery/suit_storage_unit/explorer/engineer
name = "Expeditionary Engineer Voidsuit Storage Unit"
suit = /obj/item/clothing/suit/space/void/engineer
helmet = /obj/item/clothing/head/helmet/space/void/engineer
boots = /obj/item/clothing/shoes/magboots
tank = /obj/item/tank/oxygen
mask = /obj/item/clothing/mask/breath
req_access = list(access_explorer, access_expedition_shuttle_helm)
islocked = 1
ssu_color = "#bf8833"

/obj/machinery/suit_storage_unit/explorer/medic
name = "Expeditionary Medic Voidsuit Storage Unit"
suit = /obj/item/clothing/suit/space/void/medic
helmet = /obj/item/clothing/head/helmet/space/void/medic
boots = /obj/item/clothing/shoes/magboots
tank = /obj/item/tank/oxygen
mask = /obj/item/clothing/mask/breath
req_access = list(access_explorer, access_expedition_shuttle_helm)
islocked = 1
ssu_color = "#8caecb"

/obj/machinery/suit_storage_unit/standard_unit
icon_state = "industrial"
base_icon_state = "industrial"
Expand Down
12 changes: 6 additions & 6 deletions maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -44763,6 +44763,10 @@
/obj/item/inflatable_dispenser,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/engine_eva)
"gDy" = (
/obj/machinery/suit_storage_unit/explorer/engineer,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/exploration/eva)
"gDD" = (
/obj/structure/closet/secure_closet/el,
/obj/floor_decal/borderfloor{
Expand Down Expand Up @@ -122573,11 +122577,7 @@
},
/area/space)
"sgt" = (
/obj/machinery/suit_storage_unit/explorer,
/obj/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/machinery/suit_storage_unit/explorer/medic,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/exploration/eva)
"sgv" = (
Expand Down Expand Up @@ -184926,7 +184926,7 @@ plv
wBb
xYO
xyI
oWS
gDy
sgt
szw
lJL
Expand Down
79 changes: 79 additions & 0 deletions mods/_master_files/code/modules/clothing/voidsuits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/obj/item/clothing/head/helmet/space/void/medic
desc = "An atmos resistant helmet for space and planet exploration."
name = "medic voidsuit helmet"
icon = 'maps/torch/icons/obj/obj_head_solgov.dmi'
item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_head.dmi')
icon_state = "rig0_explorer"
item_state = "medic_helm"
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
light_overlay = "helmet_light_dual"
tinted = FALSE
/obj/item/clothing/suit/space/void/medic
desc = "An atmos resistant voidsuit for space and planet exploration."
name = "medic voidsuit"
icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi'
item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi')
icon_state = "void_medic"
item_state = "medic_rig"
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/rcd,/obj/item/rpd)

/obj/item/clothing/head/helmet/space/void/engineer
desc = "An atmos resistant helmet for space and planet exploration."
name = "engineer voidsuit helmet"
icon = 'maps/torch/icons/obj/obj_head_solgov.dmi'
item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_head.dmi')
icon_state = "rig0_explorer"
item_state = "engie_helm"
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
light_overlay = "helmet_light_dual"
tinted = FALSE
/obj/item/clothing/suit/space/void/engineer
desc = "An atmos resistant voidsuit for space and planet exploration."
name = "engineer voidsuit"
icon = 'maps/sierra/icons/obj/clothing/obj_suit.dmi'
item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi')
icon_state = "void_engie"
item_state = "engie_rig"
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SMALL
)
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/toolbox,/obj/item/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/rcd,/obj/item/rpd)

/obj/item/clothing/suit/space/void/engineer/prepared
helmet = /obj/item/clothing/head/helmet/space/void/engineer
boots = /obj/item/clothing/shoes/magboots
item_flags = ITEM_FLAG_THICKMATERIAL | ITEM_FLAG_INVALID_FOR_CHAMELEON

/obj/item/clothing/suit/space/void/medic/prepared
helmet = /obj/item/clothing/head/helmet/space/void/medic
boots = /obj/item/clothing/shoes/magboots
item_flags = ITEM_FLAG_THICKMATERIAL | ITEM_FLAG_INVALID_FOR_CHAMELEON

/obj/item/clothing/head/helmet/space/void/medic
camera = /obj/machinery/camera/network/helmet

/obj/item/clothing/head/helmet/space/void/engineer
camera = /obj/machinery/camera/network/helmet
77 changes: 77 additions & 0 deletions mods/ex_rigs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@

#### Список PRов:

- https://github.com/SierraBay/SierraBay12/pull/#####
<!--
Ссылки на PRы, связанные с модом:
- Создание
- Большие изменения
-->

<!-- Название мода. Не важно на русском или на английском. -->
## Мод-пример

ID мода: EX_RIGS
<!--
Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
которое ты будешь использовать для обозначения файлов.
-->

### Описание мода

Добавляет новые риги для ЭК-инженера, и ЭК-медика
<!--
Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
А также любая полезная информация.
-->

### Изменения *кор кода*

- Отсутствует (сам в шоке)
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Нужно указать и файл, и процедуры/переменные.
Изменений нет - напиши "Отсутствуют"
-->

### Оверрайды

- `mods/_master_files/code/modules/clothing/voidsuits.dm`
<!--
Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
Здесь указываются оверрайды в твоём моде и папке `_master_files`
Изменений нет - напиши "Отсутствуют"
-->

### Дефайны

- нет
<!--
Если требовалось добавить какие-либо дефайны, укажи файлы,
в которые ты их добавил, а также перечисли имена.
И то же самое, если ты используешь дефайны, определённые другим модом.
Не используешь - напиши "Отсутствуют"
-->

### Используемые файлы, не содержащиеся в модпаке

- нет
<!--
Будь то немодульный файл или модульный файл, который не содержится в папке,
принадлежащей этому конкретному моду, он должен быть упомянут здесь.
Хорошими примерами являются иконки или звуки, которые используются одновременно
несколькими модулями, или что-либо подобное.
-->

### Авторы:

ddorou
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
В случае порта чего-либо должна быть ссылка на источник.
-->
4 changes: 4 additions & 0 deletions mods/ex_rigs/_ex_rigs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/singleton/modpack/example
name = "EX_RIGS"
desc = "Новые риги для ЭК медика и инженера."
author = "ddorou"
8 changes: 8 additions & 0 deletions mods/ex_rigs/_ex_rigs.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ifndef EX_RIGS
#define EX_RIGS


// Далее просто включай свой код
// #include "code/something.dm"

#endif