forked from shiptest-ss13/Shiptest
-
-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Добалены флаги и гробы * Обновлен ассортимент, добавлен флаг пиратов красной звезды * Вытащен флаг сепаратистов * Добавлены новые флаги и код * фикс * фикс имени файла --------- Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
- Loading branch information
1 parent
17385a3
commit 4be3e99
Showing
6 changed files
with
261 additions
and
7 deletions.
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
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,84 @@ | ||
|
|
||
| #### Список PRов | ||
|
|
||
| - https://github.com/CeladonSS13/Shiptest/pulls/##### | ||
| <!-- | ||
| Ссылки на PRы, связанные с модом: | ||
| - Создание | ||
| - Большие изменения | ||
| --> | ||
|
|
||
| <!-- Название мода. Не важно на русском или на английском. --> | ||
| ## Флаги | ||
|
|
||
| ID мода: FLAGS | ||
| <!-- | ||
| Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ, | ||
| которое ты будешь использовать для обозначения файлов. | ||
| При запуске скрипта выставляется автоматически. | ||
| --> | ||
|
|
||
| ### Описание мода | ||
|
|
||
| Этот мод добавляет новые флаги и гроба. Пока что тут иностранные все, но со временем заменим на наши лорные | ||
| <!-- | ||
| Что он делает, что добавляет: что, куда, зачем и почему - всё здесь. | ||
| А также любая полезная информация. | ||
| --> | ||
|
|
||
| ### Изменения *кор кода* | ||
|
|
||
| - Отсутствуют | ||
| <!-- | ||
| Если вы редактировали какие-либо процедуры или переменные в кор коде, | ||
| они должны быть указаны здесь. | ||
| Нужно указать и файл, и процедуры/переменные. | ||
| Изменений нет - напиши "Отсутствуют" | ||
| Примеры: `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` | ||
| --> | ||
|
|
||
| ### Оверрайды | ||
|
|
||
| - Отсутствуют | ||
| <!-- | ||
| Если ты добавлял новый модульный оверрайд, его нужно указать здесь. | ||
| Здесь указываются оверрайды в твоём моде и папке `_master_files` | ||
| Изменений нет - напиши "Отсутствуют" | ||
| Примеры: | ||
| - `mods/_master_files/sound/my_cool_sound.ogg` | ||
| - `mods/_master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` | ||
| --> | ||
|
|
||
| ### Дефайны | ||
|
|
||
| - Отсутствуют | ||
| <!-- | ||
| Если требовалось добавить какие-либо дефайны, укажи файлы, | ||
| в которые ты их добавил, а также перечисли имена. | ||
| И то же самое, если ты используешь дефайны, определённые другим модом. | ||
| Не используешь - напиши "Отсутствуют" | ||
| Примеры: `code/__defines/~mods/flags.dm`: `FLAGS_SPEED_MULTIPLIER`, `FLAGS_SPEED_BASE` | ||
| --> | ||
|
|
||
| ### Используемые файлы, не содержащиеся в модпаке | ||
|
|
||
| - Отсутствуют | ||
| <!-- | ||
| Будь то немодульный файл или модульный файл, который не содержится в папке, | ||
| принадлежащей этому конкретному моду, он должен быть упомянут здесь. | ||
| Хорошими примерами являются иконки или звуки, которые используются одновременно | ||
| несколькими модулями, или что-либо подобное. | ||
| Примеры: `mods/_master_files/icons/obj/alien.dmi` | ||
| --> | ||
|
|
||
| ### Авторы | ||
|
|
||
| MrCat15352 | ||
| <!-- | ||
| Здесь находится твой никнейм | ||
| Если работал совместно - никнеймы тех, кто помогал. | ||
| В случае порта чего-либо должна быть ссылка на источник. | ||
| --> |
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,6 @@ | ||
| /datum/modpack/flags | ||
| name = "Флаги и гробы" | ||
| desc = "Вносит в игру разнообразные флаги, для картоделов и для игроков." | ||
| author = "MrCat15352" | ||
|
|
||
| ///**********************************************************************/// |
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 MODPACK_CELADON_FLAGS | ||
| #define MODPACK_CELADON_FLAGS | ||
|
|
||
| #include "_flags.dm" | ||
|
|
||
| #include "code/flags.dm" | ||
|
|
||
| #endif |
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,163 @@ | ||
| // STRUCTURE FLAGS - THE WALL MOUNTS | ||
|
|
||
| /obj/structure/sign/flag/blank | ||
| name = "flag of blank" | ||
| desc = "The flag of nothing. It has nothing on it. Beautiful." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_blank" | ||
| item_flag = /obj/item/sign/flag/blank | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/blank, 32) | ||
|
|
||
| /obj/structure/sign/flag/pirate | ||
| name = "flag of the Pirate" | ||
| desc = "The flag of Pirate." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_pirate" | ||
| item_flag = /obj/item/sign/flag/pirate | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/pirate, 32) | ||
|
|
||
| /obj/structure/sign/flag/red_star | ||
| name = "flag of the Red Star Pirate" | ||
| desc = "The flag of the Red Star Pirate." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_red_star" | ||
| item_flag = /obj/item/sign/flag/red_star | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/red_star, 32) | ||
|
|
||
| /obj/structure/sign/flag/independed | ||
| name = "flag of the Independed" | ||
| desc = "The flag of Independed." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_independed" | ||
| item_flag = /obj/item/sign/flag/independed | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/independed, 32) | ||
|
|
||
| /obj/structure/sign/flag/elysim | ||
| name = "Seal of the Elysim government" | ||
| desc = "A seal emblazened with a gold trim depicting the burning star, sol." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_elysim" | ||
| item_flag = /obj/item/sign/flag/elysim | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/elysim, 32) | ||
|
|
||
| /obj/structure/sign/flag/inteq | ||
| name = "flag of the InteQ" | ||
| desc = "The flag of InteQ." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_inteq" | ||
| item_flag = /obj/item/sign/flag/inteq | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/inteq, 32) | ||
|
|
||
| /obj/structure/sign/flag/nanotrasen | ||
| name = "flag of Nanotrasen" | ||
| desc = "The official corporate flag of Nanotrasen. Mostly flown as a ceremonial piece, or to mark land on a new frontier." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_nt" | ||
| item_flag = /obj/item/sign/flag/nanotrasen | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/nanotrasen, 32) | ||
|
|
||
| /obj/structure/sign/flag/separatists | ||
| name = "flag of the Elysim Separatists" | ||
| desc = "The flag of Elysim Separatists." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_separatist" | ||
| item_flag = /obj/item/sign/flag/separatists | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/separatists, 32) | ||
|
|
||
| /obj/structure/sign/flag/solfed | ||
| name = "flag of the Sol Federation" | ||
| desc = "The flag of Sol Federation." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_solfed" | ||
| item_flag = /obj/item/sign/flag/solfed | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/solfed, 32) | ||
|
|
||
| /obj/structure/sign/flag/syndicate | ||
| name = "flag of the Syndicate" | ||
| desc = "The flag of the Sothran Syndicate. Previously used by the Sothran people as a way of declaring opposition against the Nanotrasen, now it became an intergalactic symbol of the same, yet way more skewed purpose, as more groups of interest have joined the rebellion's side for their own gain." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "flag_syndi" | ||
| item_flag = /obj/item/sign/flag/syndicate | ||
|
|
||
| MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/syndicate, 32) | ||
|
|
||
| // ITEM FLAGS - THE THINGS YOU HOLD AND PLACE | ||
| /obj/item/sign/flag/blank | ||
| name = "folded blank flag" | ||
| desc = "The folded flag of nothing. It has nothing on it. Beautiful." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_blank" | ||
| sign_path = /obj/structure/sign/flag/blank | ||
| is_editable = FALSE | ||
|
|
||
| /obj/item/sign/flag/pirate | ||
| name = "folded of the Pirate" | ||
| desc = "The folded of Pirate." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_pirate" | ||
| sign_path = /obj/structure/sign/flag/pirate | ||
|
|
||
| /obj/item/sign/flag/red_star | ||
| name = "folded flag of the Red Star Pirate" | ||
| desc = "The folded flag of Red Star Pirate." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_red_star" | ||
| sign_path = /obj/structure/sign/flag/red_star | ||
|
|
||
| /obj/item/sign/flag/independed | ||
| name = "folded flag of the Independed" | ||
| desc = "The folded flag of Independed." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_independed" | ||
| sign_path = /obj/structure/sign/flag/independed | ||
|
|
||
| /obj/item/sign/flag/elysim | ||
| name = "folded flag of the Elysim government" | ||
| desc = "The folded flag of Elysim government." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_elysim" | ||
| sign_path = /obj/structure/sign/flag/elysim | ||
|
|
||
| /obj/item/sign/flag/inteq | ||
| name = "folded flag of the InteQ" | ||
| desc = "The folded flag of InteQ." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_inteq" | ||
| sign_path = /obj/structure/sign/flag/inteq | ||
|
|
||
| /obj/item/sign/flag/nanotrasen | ||
| name = "folded flag of the Nanotrasen" | ||
| desc = "The folded flag of the Nanotrasen." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_nt" | ||
| sign_path = /obj/structure/sign/flag/nanotrasen | ||
|
|
||
| /obj/item/sign/flag/separatists | ||
| name = "folded flag of the Elysim Separatists" | ||
| desc = "The folded flag of Elysim Separatists." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_separatist" | ||
| sign_path = /obj/structure/sign/flag/separatists | ||
|
|
||
| /obj/item/sign/flag/solfed | ||
| name = "folded flag of the Sol Federation" | ||
| desc = "The folded flag of Sol Federation." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_solfed" | ||
| sign_path = /obj/structure/sign/flag/solfed | ||
|
|
||
| /obj/item/sign/flag/syndicate | ||
| name = "folded flag of the Syndicate" | ||
| desc = "The folded flag of the Sothran Syndicate." | ||
| icon = 'mod_celadon/flags/icons/flags.dmi' | ||
| icon_state = "folded_syndi" | ||
| sign_path = /obj/structure/sign/flag/syndicate |
Binary file not shown.