forked from shiptest-ss13/Shiptest
-
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UPDATE: Outpost & Ghost Roles (#924)
* База * Выпиливаем ненужный пак * Встраиваем гост рольки на аванпост, чиним некоторые баги и огрехи на карте зимнего астероида * Прописываем, что повара могут драться и в зонах бара и ботаники * Добавляем горничную одежду тактическую но белого цвета и без статов, для рольки * И вот сюда добавляем аутфиты, джобки, спавн на аванпост ролек. * Реворк аванпоста * Внесены доработки в карту зимнего аванпоста. Втсречайте, новый бар! * Обновлена карта * Добавляем крафт и новый объект мусорный стол из Scrapa за 10 штук! * Добавлены новые занавески * А это полы на будущее. Плюс новый снег * обновлен аванпост * Добавлен вариант барного деревянного стола * Добавлены различные новые структуры, тюрфы, полы, снег * Добавлены новые лестницы * фикс * Добавлены атласы * удаляем мусор * Исправляем ошибки лестниц и включаем их * Добавляем тех пол новый * Добавлена мраморная плитка * Добавлен новый вид полов для морозильника. Цвета новые * Добавляем пути в дме * Добавлен набор стеклянных полов * Протестирована новая плитка * Отключаем замену пыли на ржавчину для стеклянного пола и мрамора * Сделаны текстурки для перевернутого стола из мусора. Уменьшена прочность до 60 * Добавляем новые вариации столов из плазмостекла, усиленного стекла, пластитанового стекла, титанового стекла, усиленного стекла, плазмоусиленного стекла * Еще столы * Добавлены еще две роли для гостов, это бродяга и артист (клоун). Пофикшены мелкие недочеты у других ролек * Исправлены опечатки * Добавлен параметр фракции для всех гост ролек. А то как бы они гражданины Элизиума * Исправлен доступ для мэйдочки, до этого она не могла покинуть свою комнату... * Исправлены спавнеры ролек гостов * Замена дроп спавна у бомжа на грязный матрасс * Покупаем повару обувь * Отправляем в щитспавн indie_space - по приказу Head of Maps * Поправлены карты, на второй аванпост добавлены гост рольки * Чиним и выключаем халявную еду во всех автоматах. Плюс одежда тоже. * Добавлен стол синдикатовского варианта. Пофикшен требуемый материал для усиленного стеклянного стола * Добавлен синдикатный стол * Сделаны спрайты для синди металла --------- Signed-off-by: MrCat15352 <[email protected]>
- Loading branch information
1 parent
0c73c42
commit 54e75a6
Showing
18 changed files
with
10,621 additions
and
6,708 deletions.
There are no files selected for viewing
16,710 changes: 10,103 additions & 6,607 deletions
16,710
_maps/_mod_celadon/outpost/elysium_ice.dmm
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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,11 @@ | ||
#ifndef MODPACK_CELADON_GHOST_ROLES | ||
#define MODPACK_CELADON_GHOST_ROLES | ||
|
||
#include "_ghost_roles.dm" | ||
|
||
#include "code/cards_id.dm" | ||
#include "code/outfits.dm" | ||
#include "code/drop_location.dm" | ||
#include "code/outpost/elysium_ice.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,62 @@ | ||
// Bartender | ||
|
||
/obj/item/card/id/elysium_Bartender | ||
name = "\improper Elysium bar access card" | ||
desc = "An access card sourced from Elysium for bartender." | ||
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi' | ||
icon_state = "elysium" | ||
uses_overlays = FALSE | ||
|
||
/obj/item/card/id/elysium_Bartender/Initialize() | ||
access = get_service_accesses_outpost() | ||
. = ..() | ||
|
||
// Cook | ||
|
||
/obj/item/card/id/elysium_cook | ||
name = "\improper Elysium kitchen access card" | ||
desc = "An access card sourced from Elysium for cook." | ||
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi' | ||
icon_state = "elysium" | ||
uses_overlays = FALSE | ||
|
||
/obj/item/card/id/elysium_cook/Initialize() | ||
access = get_service_accesses_outpost() | ||
. = ..() | ||
|
||
// Maid | ||
|
||
/obj/item/card/id/elysium_maid | ||
name = "\improper Elysium maid access card" | ||
desc = "An access card sourced from Elysium for maid." | ||
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi' | ||
icon_state = "elysium" | ||
uses_overlays = FALSE | ||
|
||
/obj/item/card/id/elysium_cook/Initialize() | ||
. = ..() | ||
|
||
// Artist | ||
|
||
/obj/item/card/id/elysium_artist | ||
name = "\improper Elysium artist access card" | ||
desc = "An access card sourced from Elysium for artist." | ||
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi' | ||
icon_state = "elysium" | ||
uses_overlays = FALSE | ||
|
||
/obj/item/card/id/elysium_artist/Initialize() | ||
access = get_service_accesses_outpost() | ||
. = ..() | ||
|
||
// Wagabond | ||
|
||
/obj/item/card/id/elysium_wagabond | ||
name = "\improper Elysium wagabond access card" | ||
desc = "An access card sourced from Elysium for wagabond." | ||
icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi' | ||
icon_state = "elysium" | ||
uses_overlays = FALSE | ||
|
||
/obj/item/card/id/elysium_wagabond/Initialize() | ||
. = ..() |
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,21 @@ | ||
// Пока что это будут криоподы | ||
/obj/machinery/cryopod/outpost/cook | ||
name = "sleeper a cook" | ||
desc = "A closed apparatus designed for the chef." | ||
|
||
/obj/machinery/cryopod/outpost/bartender | ||
name = "sleeper a bartender" | ||
desc = "A closed apparatus designed for the bartender." | ||
|
||
/obj/machinery/cryopod/outpost/maid | ||
name = "sleeper a maid" | ||
desc = "A closed apparatus designed for the maid." | ||
|
||
/obj/machinery/cryopod/outpost/artist | ||
name = "sleeper a artist" | ||
desc = "A closed apparatus designed for the artist." | ||
|
||
// Исключение для бомжа | ||
/obj/structure/bed/outpost/wagabond | ||
name = "bed a wagabond" | ||
icon_state = "dirty_mattress" |
Oops, something went wrong.