forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Порт ремапа пляжа с ТГ - tgstation/tgstation#78568 По большей части он полноценный, за исключением следующих вещей: Рыбалка и принадлежности для неё. Пара мелочей на которые в целом похуй. <!-- Вкратце опишите изменения, которые вносите. --> <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> <!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> ## Почему это хорошо для игры Пляж становится чуть более интересным и красивым. <!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. --> ## Изображения изменений ![2023-10-27 12 34 06](https://github.com/ss220club/Paradise-SS220/assets/69762909/8d4e87f5-391e-4207-85d8-fe9300e1f18a) <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> ## Тестирование В процессе, но вроде всё ок. <!-- Как вы тестировали свой PR, если делали это вовсе? --> ## Changelog :cl: add: Если вам не повезло, и вы мало того что гейтер, так вам ещё и выпал пляж, не расстраивайтесь, он теперь получше. /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. -->
- Loading branch information
Showing
29 changed files
with
24,285 additions
and
3,448 deletions.
There are no files selected for viewing
27,303 changes: 23,863 additions & 3,440 deletions
27,303
_maps/map_files220/RandomZLevels/beach.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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,95 @@ | ||
/obj/item/bedsheet | ||
icon = 'modular_ss220/aesthetics/sheets/icons/sheets.dmi' | ||
|
||
/obj/item/bedsheet/double | ||
icon_state = "double_sheetwhite" | ||
|
||
/obj/item/bedsheet/blue/double | ||
icon_state = "double_sheetblue" | ||
|
||
/obj/item/bedsheet/green/double | ||
icon_state = "double_sheetgreen" | ||
|
||
/obj/item/bedsheet/grey/double | ||
icon_state = "double_sheetgrey" | ||
|
||
/obj/item/bedsheet/orange/double | ||
icon_state = "double_sheetorange" | ||
|
||
/obj/item/bedsheet/purple/double | ||
icon_state = "double_sheetpurple" | ||
|
||
/obj/item/bedsheet/patriot/double | ||
icon_state = "double_sheetUSA" | ||
|
||
/obj/item/bedsheet/rainbow/double | ||
icon_state = "double_sheetrainbow" | ||
|
||
/obj/item/bedsheet/red/double | ||
icon_state = "double_sheetred" | ||
|
||
/obj/item/bedsheet/yellow/double | ||
icon_state = "double_sheetyellow" | ||
|
||
/obj/item/bedsheet/mime/double | ||
icon_state = "double_sheetmime" | ||
|
||
/obj/item/bedsheet/clown/double | ||
icon_state = "double_sheetclown" | ||
|
||
/obj/item/bedsheet/captain/double | ||
icon_state = "double_sheetcaptain" | ||
|
||
/obj/item/bedsheet/rd/double | ||
icon_state = "double_sheetrd" | ||
|
||
/obj/item/bedsheet/medical/double | ||
icon_state = "double_sheetmedical" | ||
|
||
/obj/item/bedsheet/cmo/double | ||
icon_state = "double_sheetcmo" | ||
|
||
/obj/item/bedsheet/hos/double | ||
icon_state = "double_sheethos" | ||
|
||
/obj/item/bedsheet/hop/double | ||
icon_state = "double_sheethop" | ||
|
||
/obj/item/bedsheet/ce/double | ||
icon_state = "double_sheetce" | ||
|
||
/obj/item/bedsheet/qm/double | ||
icon_state = "double_sheetqm" | ||
|
||
/obj/item/bedsheet/chaplain/double | ||
icon_state = "double_sheetchap" | ||
|
||
/obj/item/bedsheet/brown/double | ||
icon_state = "double_sheetbrown" | ||
|
||
/obj/item/bedsheet/black/double | ||
icon_state = "double_sheetblack" | ||
|
||
/obj/item/bedsheet/centcom/double | ||
icon_state = "double_sheetcentcom" | ||
|
||
/obj/item/bedsheet/syndie/double | ||
icon_state = "double_sheetsyndie" | ||
|
||
/obj/item/bedsheet/cult/double | ||
icon_state = "double_sheetcult" | ||
|
||
/obj/item/bedsheet/wiz/double | ||
icon_state = "double_sheetwiz" | ||
|
||
/obj/item/bedsheet/rev/double | ||
icon_state = "double_sheetrev" | ||
|
||
/obj/item/bedsheet/nanotrasen/double | ||
icon_state = "double_sheetNT" | ||
|
||
/obj/item/bedsheet/ian/double | ||
icon_state = "double_sheetian" | ||
|
||
/obj/item/bedsheet/cosmos/double | ||
icon_state = "double_sheetcosmos" |
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
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.
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,23 @@ | ||
/obj/structure/fluff/beach_umbrella | ||
name = "пляжный зонтик" | ||
desc = "Зонтик, предназначенный для защиты от солнца на пляже." | ||
icon = 'modular_ss220/objects/icons/umbrella.dmi' | ||
icon_state = "brella" | ||
density = FALSE | ||
anchored = TRUE | ||
deconstructible = FALSE | ||
|
||
/obj/structure/fluff/beach_umbrella/security | ||
icon_state = "hos_brella" | ||
|
||
/obj/structure/fluff/beach_umbrella/science | ||
icon_state = "rd_brella" | ||
|
||
/obj/structure/fluff/beach_umbrella/engine | ||
icon_state = "ce_brella" | ||
|
||
/obj/structure/fluff/beach_umbrella/cap | ||
icon_state = "cap_brella" | ||
|
||
/obj/structure/fluff/beach_umbrella/syndi | ||
icon_state = "syndi_brella" |
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,20 @@ | ||
// Double Beds, for luxurious sleeping, i.e. the captain and maybe heads- if people use this for ERP, send them to skyrat | ||
/obj/structure/bed/double | ||
name = "double bed" | ||
desc = "A luxurious double bed, for those too important for small dreams." | ||
icon = 'modular_ss220/objects/icons/bed.dmi' | ||
icon_state = "bed_double" | ||
buildstackamount = 4 | ||
max_buckled_mobs = 2 | ||
/// The mob who buckled to this bed second, to avoid other mobs getting pixel-shifted before he unbuckles. | ||
var/mob/living/goldilocks | ||
|
||
/obj/structure/bed/double/post_buckle_mob(mob/living/target) | ||
if(buckled_mobs.len > 1 && !goldilocks) // Push the second buckled mob a bit higher from the normal lying position | ||
target.pixel_y = target.pixel_y + 12 | ||
goldilocks = target | ||
|
||
/obj/structure/bed/double/post_unbuckle_mob(mob/living/target) | ||
target.pixel_y = target.pixel_y + target.get_standard_pixel_y_offset() | ||
if(target == goldilocks) | ||
goldilocks = null |
Oops, something went wrong.