forked from Baystation12/Baystation12
-
Notifications
You must be signed in to change notification settings - Fork 70
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
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
e42e114
хранилища
ddorou 39172ce
добавил на карту
ddorou 58bbc91
бум
ddorou 2bec86e
мяу
ddorou 8bad4f8
прочитай меня
ddorou f759cb1
еще спрайты
ddorou 4a9b44c
поменял спрайты
ddorou 125cdbe
я злодей
ddorou b3d8311
я добрый
ddorou 2192dc5
meow
ddorou 6f07849
блять как тут вообще появился КОНФЛИКТ
ddorou ac71726
боже помоги
ddorou b93c438
пиздец
ddorou 2c6572a
работай пж
ddorou bfe50fc
Merge branch 'staging-sierra' into new-suit
ddorou 73d8f4d
работай
ddorou df15674
Merge branch 'new-suit' of https://github.com/ddorou/SierraBay12 into…
ddorou 722e66b
уээ)
ddorou 7722e14
Merge branch 'staging-sierra' into new-suit
ddorou 7a9d7bc
последний раз (надеюсь)
ddorou 0a3496a
увы
ddorou 0a328cc
все, это точно ласт (точно)
ddorou 38a9ab5
Merge branch 'staging-sierra' into new-suit
ddorou 892da90
Merge branch 'staging-sierra' into new-suit
ddorou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
<!-- | ||
Здесь находится твой никнейм | ||
Если работал совместно - никнеймы тех, кто помогал. | ||
В случае порта чего-либо должна быть ссылка на источник. | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
/singleton/modpack/example | ||
name = "EX_RIGS" | ||
desc = "Новые риги для ЭК медика и инженера." | ||
author = "ddorou" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
?There was a problem hiding this comment.
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