Swift fix #13
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,119 @@ | ||
|
|
||
| #### Список PRов: | ||
|
|
||
| - https://github.com/SierraBay/SierraBay12/pull/2054 | ||
| <!-- | ||
| Ссылки на PRы, связанные с модом: | ||
| - Создание | ||
| - Большие изменения | ||
| --> | ||
|
|
||
| <!-- Название мода. Не важно на русском или на английском. --> | ||
| ## Резоми | ||
|
|
||
| ID мода: RESOMI | ||
| <!-- | ||
| Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ, | ||
| которое ты будешь использовать для обозначения файлов. | ||
| --> | ||
|
|
||
| ### Описание мода | ||
|
|
||
| Ря! | ||
| - Портирует расу резоми с Infinity. | ||
| <!-- | ||
| Что он делает, что добавляет: что, куда, зачем и почему - всё здесь. | ||
| А также любая полезная информация. | ||
| --> | ||
|
|
||
| ### Изменения *кор кода* | ||
|
|
||
| - `code/modules/client/preference_setup/loadout/lists/misc.dm` | ||
| - `/datum/gear/plush_toy/New()` | ||
| - `code/modules/organs/external/_external_icons.dm` | ||
| - `/obj/item/organ/external/on_update_icon()` | ||
| - `mods/resomi/code/overrides.dm` | ||
| - `/mob/living/carbon/human/get_pulse_as_number()` | ||
| - `code/modules/clothing/head/jobs.dm` | ||
| - `/obj/item/clothing/head/beret` | ||
| - `/obj/item/clothing/head/beret/Initialize()` | ||
| - `/obj/item/clothing/head/beret/equipped()` | ||
| - `code/modules/clothing/masks/miscellaneous.dm` | ||
| - `/obj/item/clothing/mask/bandana/equipped()` | ||
|
|
||
| <!-- | ||
| Если вы редактировали какие-либо процедуры или переменные в кор коде, | ||
| они должны быть указаны здесь. | ||
| Нужно указать и файл, и процедуры/переменные. | ||
|
|
||
| Изменений нет - напиши "Отсутствуют" | ||
| --> | ||
|
|
||
| ### Оверрайды | ||
|
|
||
| - `Отсутствуют` | ||
|
|
||
| <!-- | ||
| Если ты добавлял новый модульный оверрайд, его нужно указать здесь. | ||
| Здесь указываются оверрайды в твоём моде и папке `_master_files` | ||
|
|
||
| Изменений нет - напиши "Отсутствуют" | ||
| --> | ||
|
|
||
| ### Дефайны | ||
|
There was a problem hiding this comment. Изменить список добавляемых дефайнов, убрав отсюда всё лишнее и добавив нужное. |
||
|
|
||
| - `code/__defines/~mods/~master_defines.dm`: | ||
| - `SPECIES_RESOMI` | ||
| - `LANGUAGE_RESOMI` | ||
| - `mods/resomi/code/datum/_defines.dm`: | ||
| - `CULTURE_RESOMI_EREMUS` | ||
| - `CULTURE_RESOMI_ASRANDA` | ||
| - `CULTURE_RESOMI_REFUGEE` | ||
| - `CULTURE_RESOMI_NEWGENERATION` | ||
| - `CULTURE_RESOMI_LOSTCOLONYRICH` | ||
| - `CULTURE_RESOMI_LOSTCOLONYPOOR` | ||
| - `CULTURE_RESOMI_SKRELL` | ||
| - `HOME_SYSTEM_RESOMI_BIRDCAGE` | ||
| - `HOME_SYSTEM_RESOMI_EREMUS` | ||
| - `HOME_SYSTEM_RESOMI_ASRANDA` | ||
| - `HOME_SYSTEM_RESOMI_SAVEEL` | ||
| - `HOME_SYSTEM_RESOMI_LOST_COLONY` | ||
| - `HOME_SYSTEM_RESOMI_REFUGEE_COLONY` | ||
| - `HOME_SYSTEM_RESOMI_HOMELESS` | ||
| - `HOME_SYSTEM_RESOMI_IMPER_COLONY` | ||
| - `HOME_SYSTEM_RESOMI_RESOBALAK` | ||
| - `RELIGION_RESOMI_CHOSEN` | ||
| - `RELIGION_RESOMI_EMPEROR` | ||
| - `RELIGION_RESOMI_MOUNTAIN` | ||
| - `RELIGION_RESOMI_SKIES` | ||
| <!-- | ||
| Если требовалось добавить какие-либо дефайны, укажи файлы, | ||
| в которые ты их добавил, а также перечисли имена. | ||
| И то же самое, если ты используешь дефайны, определённые другим модом. | ||
|
|
||
| Не используешь - напиши "Отсутствуют" | ||
| --> | ||
|
|
||
| ### Используемые файлы, не содержащиеся в модпаке | ||
|
|
||
| - `Отсутствуют` | ||
| <!-- | ||
| Будь то немодульный файл или модульный файл, который не содержится в папке, | ||
| принадлежащей этому конкретному моду, он должен быть упомянут здесь. | ||
| Хорошими примерами являются иконки или звуки, которые используются одновременно | ||
| несколькими модулями, или что-либо подобное. | ||
| --> | ||
|
|
||
| ### Авторы: | ||
|
|
||
|
|
||
| LordNest | ||
| SurEugene | ||
| Daeberdir | ||
| UEDHighCommand | ||
|
|
||
| При крайне необходимой моральной поддержке ксеномодераторов Imony и TheGrimArcadia | ||
| <!-- | ||
| Здесь находится твой никнейм | ||
| Если работал совместно - никнеймы тех, кто помогал. | ||
| В случае порта чего-либо должна быть ссылка на источник. | ||
| --> | ||
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,2 @@ | ||
| /singleton/modpack/resomi | ||
| name = "Resomi Content" |
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,52 @@ | ||
| #ifndef MODPACK_RESOMI | ||
| #define MODPACK_RESOMI | ||
|
|
||
| #include "_resomi.dm" | ||
| #include "code/unit_tests.dm" | ||
| #include "code/body/abilities.dm" | ||
| #include "code/body/emotes.dm" | ||
| #include "code/body/organs.dm" | ||
| #include "code/clothing/void/rigs.dm" | ||
| #include "code/clothing/clothing.dm" | ||
| #include "code/clothing/glasses.dm" | ||
| #include "code/clothing/misc.dm" | ||
| #include "code/clothing/shoes.dm" | ||
| #include "code/clothing/suits.dm" | ||
| #include "code/clothing/under.dm" | ||
| #include "code/datum/_defines.dm" | ||
| #include "code/datum/body.dm" | ||
| #include "code/datum/gear.dm" | ||
| #include "code/datum/language.dm" | ||
| #include "code/datum/misc.dm" | ||
| #include "code/datum/resomi_culture.dm" | ||
| #include "code/datum/species.dm" | ||
|
|
||
| #endif | ||
| // BEGIN_INTERNALS | ||
| // END_INTERNALS | ||
| // BEGIN_FILE_DIR | ||
| #define FILE_DIR . | ||
| // END_FILE_DIR | ||
| // BEGIN_PREFERENCES | ||
| // END_PREFERENCES | ||
| // BEGIN_INCLUDE | ||
| #include "_resomi.dm" | ||
| #include "code\unit_tests.dm" | ||
| #include "code\body\abilities.dm" | ||
| #include "code\body\emotes.dm" | ||
| #include "code\body\organs.dm" | ||
| #include "code\clothing\clothing.dm" | ||
| #include "code\clothing\glasses.dm" | ||
| #include "code\clothing\misc.dm" | ||
| #include "code\clothing\shoes.dm" | ||
| #include "code\clothing\suits.dm" | ||
| #include "code\clothing\under.dm" | ||
| #include "code\clothing\void\rigs.dm" | ||
| #include "code\datum\_defines.dm" | ||
| #include "code\datum\body.dm" | ||
| #include "code\datum\gear.dm" | ||
| #include "code\datum\language.dm" | ||
| #include "code\datum\misc.dm" | ||
| #include "code\datum\resomi_culture.dm" | ||
| #include "code\datum\species.dm" | ||
| // END_INCLUDE |
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 @@ | ||
| /mob/living/proc/toggle_pass_table() | ||
| set category = "Abilities" | ||
| set name = "Toggle Agility" //Dunno a better name for this. You have to be pretty agile to hop over stuff!!! | ||
| set desc = "Allows you to start/stop hopping over things such as hydroponics trays, tables, and railings." | ||
| pass_flags ^= PASS_FLAG_TABLE //I dunno what this fancy ^= is but Aronai gave it to me. | ||
| to_chat(src, "You [pass_flags&PASS_FLAG_TABLE ? "will" : "will NOT"] move over tables/railings/trays!") | ||
|
|
||
|
|
||
| /mob/living/carbon/human/proc/resomi_sonar_ping() | ||
| set name = "Listen In" | ||
| set desc = "Allows you to listen in to movement and noises around you." | ||
| set category = "Abilities" | ||
|
|
||
| if(incapacitated()) | ||
| to_chat(src, SPAN_WARNING("You need to recover before you can use this ability.")) | ||
| return | ||
| if(is_deaf() || is_below_sound_pressure(get_turf(src))) | ||
| to_chat(src, SPAN_WARNING("You are for all intents and purposes currently deaf!")) | ||
| return | ||
| to_chat(src, SPAN_NOTICE("You take a moment to listen in to your environment...")) | ||
| if(do_after(src, delay = 5, do_flags = DO_DEFAULT & ~DO_USER_SAME_HAND)) | ||
| var/heard_something = FALSE | ||
| for(var/mob/living/L in range(client.view, src)) | ||
| var/turf/T = get_turf(L) | ||
| if(!T || L == src || L.stat == DEAD || is_below_sound_pressure(T)) | ||
| continue | ||
| heard_something = TRUE | ||
| var/image/ping_image = image(icon = 'icons/effects/effects.dmi', icon_state = "sonar_ping", loc = src) | ||
| ping_image.plane = HUD_PLANE | ||
| ping_image.layer = UNDER_HUD_LAYER | ||
| ping_image.pixel_x = (T.x - src.x) * WORLD_ICON_SIZE | ||
| ping_image.pixel_y = (T.y - src.y) * WORLD_ICON_SIZE | ||
| image_to(src, ping_image) | ||
| addtimer(new Callback(src, PROC_REF(clear_sonar_effect), src.client, ping_image), 8) | ||
| var/feedback = list("There are noises of movement ") | ||
| var/direction = get_dir(src, L) | ||
| if(direction) | ||
| feedback += "towards the [dir2text(direction)], " | ||
| switch(get_dist(src, L) / client.view) | ||
| if(0 to 0.2) | ||
| feedback += "very close by." | ||
| if(0.2 to 0.4) | ||
| feedback += "close by." | ||
| if(0.4 to 0.6) | ||
| feedback += "some distance away." | ||
| if(0.6 to 0.8) | ||
| feedback += "further away." | ||
| else | ||
| feedback += "far away." | ||
| else // No need to check distance if they're standing right on-top of us | ||
| feedback += "right on top of you." | ||
| to_chat(src, SPAN_NOTICE(jointext(feedback,null))) | ||
| if(!heard_something) | ||
| to_chat(src, SPAN_NOTICE("You hear no movement but your own.")) | ||
| else | ||
| to_chat(src, SPAN_NOTICE("You need to stand still while you listen.")) | ||
|
|
||
|
|
||
| /mob/living/carbon/human/proc/clear_sonar_effect(client/C, image/I) | ||
| if(C && I) | ||
| C.images -= I | ||
| qdel(I) |
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,51 @@ | ||
| // RESOMI EMOTIONS | ||
|
|
||
| /singleton/emote/audible/chuckle/resomi | ||
| emote_sound = 'mods/resomi/sound/resomilaugh.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/cough/resomi | ||
| emote_sound = 'mods/resomi/sound/resomicough.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/laugh/resomi | ||
| emote_sound = 'mods/resomi/sound/resomilaugh.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/scream/resomi | ||
| emote_sound = 'mods/resomi/sound/resomiscream.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/sneeze/resomi | ||
| emote_sound = 'mods/resomi/sound/resomisneeze.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/peep/resomi | ||
| key = "peep" | ||
| emote_message_3p = "USER пищит" | ||
| emote_sound = 'mods/resomi/sound/peep.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/rustle/resomi | ||
| key = "rustle" | ||
| emote_message_3p = "USER шелестит крыльями" | ||
| emote_sound = 'mods/resomi/sound/rustle.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/trill/resomi | ||
| key = "trill" | ||
| emote_message_3p = "USER издаёт трель" | ||
| emote_sound = 'mods/resomi/sound/trill.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/warble/resomi | ||
| key = "warble" | ||
| emote_message_3p = "USER издаёт трель" | ||
| emote_sound = 'mods/resomi/sound/warble.ogg' | ||
| sounded_species = null | ||
|
|
||
| /singleton/emote/audible/wurble/resomi | ||
| key = "wurble" | ||
| emote_message_3p = "USER урчит" | ||
| emote_sound = 'mods/resomi/sound/wurble.ogg' | ||
| sounded_species = null |
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,30 @@ | ||
|
|
||
| // // | ||
| //EXTERNAL RESOMI ORGANS// | ||
| // // | ||
|
|
||
| /obj/item/organ/external/foot/resomi | ||
| body_hair = "feathers" | ||
|
|
||
| /obj/item/organ/external/foot/right/resomi | ||
| body_hair = "feathers" | ||
|
|
||
| /obj/item/organ/external/hand/resomi | ||
| body_hair = "feathers" | ||
|
|
||
| /obj/item/organ/external/hand/right/resomi | ||
| body_hair = "feathers" | ||
|
|
||
| // // | ||
| //INTERNAL RESOMI ORGANS// | ||
| // // | ||
|
|
||
| /obj/item/organ/internal/kidneys/resomi | ||
| parent_organ = BP_CHEST | ||
|
|
||
| /obj/item/organ/internal/liver/resomi | ||
| parent_organ = BP_CHEST | ||
|
|
||
| /obj/item/organ/internal/eyes/resomi | ||
| icon = 'mods/resomi/icons/human_races/eyes.dmi' | ||
| eye_icon = 'mods/resomi/icons/human_races/eyes.dmi' |
Oops, something went wrong.
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.
Айди мода совпадает с таковым у оригинального. Не критично, ведь мы на вряд ли будем включать их одновременно(зачем?), но лучше дописать банальное RESOMI_FD.