forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 132
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 делает Вводит новую расу: Гигантские бронированные серпентиды. За основу брались ГБСы с Сыра, но с крупными доработками\изменениями, попытками перенести механизмы на органы и конечности (по возможности - для дальнейшего экспорт на Бандастейшен). Цель - сделать вид, целиком и полностью зависящий от химических веществ в его теле, угрожающего внешнего вида, крупнее обычных игровых рас (не считая антагонистов виде императрицы чужих). Более подробная информация представлена в файле: https://docs.google.com/document/d/1vhrtJ_1wvjaCTutJ58-3pfUjhT5XeRG5hBgRThsJtqM/edit Данную расу старался делать по возможности модульно и расширяемо - для возможного изменения других рас в рамках идеи по глобальному реворку рас Парадайза. Возможно потребуется разбирать на отдельные ПРы. ## Почему это хорошо для игры Новая уникальная раса, выделяющаяся среди прочих с небольшими изменениями (фур-сьютов) достаточно значительным набором характеристик и особенностей. ## Изображения изменений ## Тестирование Локальный сервер - проверялось функционирование Сервер Блэк - проверка функционирования в бою (были выловлены и убраны некоторые критические ошибки) ## Changelog :cl: add: Добавлена новая раса - Гигантские бронированные серпентиды. /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. --> ## Summary by Sourcery Introduce the Giant Armored Serpentid race. New Features: - Added the Giant Armored Serpentid race, a large, serpentine insectoid species known for its unique organs and durable carapace. Tests: - Tested the race\'s functionality on a local server and a Black server to identify and fix critical errors. --------- Co-authored-by: Kar4es <odnakotrove@gmail.com>
- Loading branch information
Showing
94 changed files
with
19,788 additions
and
33 deletions.
There are no files selected for viewing
16,883 changes: 16,883 additions & 0 deletions
16,883
_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.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
13 changes: 13 additions & 0 deletions
13
modular_ss220/_defines220/code/signals_mob/signals_mob_carbon.dm
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 +1,14 @@ | ||
// Signals for /mob/living/carbon | ||
/// called by /mob/equip_to_slot() : (/datum/component/mob_overlay_shift) | ||
#define COMSIG_MOB_ON_EQUIP "mob_on_equip" | ||
|
||
/// called by /mob/ClickOn() : (/datum/component/mob_overlay_shift) | ||
#define COMSIG_MOB_ON_CLICK "mob_on_click" | ||
|
||
/// called by /datum/species/spec_attack_hand() /mob/living/carbon/human/MouseDrop_T() /mob/MouseDrop() : (/datum/component/gadom_cargo) (/datum/component/gadom_living) | ||
#define COMSIG_GADOM_CAN_GRAB "gadom_can_grab" | ||
#define GADOM_CAN_GRAB (1 << 0) | ||
|
||
/// called by datum/component/gadom_living/proc/try_load_mob() : (/datum/component/gadom_cargo) | ||
/// called by datum/component/gadom_cargo/proc/try_load_cargo() : (/datum/component/gadom_living) | ||
#define COMSIG_GADOM_LOAD "gadom_load" |
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
5 changes: 5 additions & 0 deletions
5
modular_ss220/_signals220/code/signals_mob/signals_mob_carbon.dm
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 +1,6 @@ | ||
// Signals for /mob/living/carbon | ||
// Расширение прока для переноса ящика на моба | ||
/mob/living/carbon/human/MouseDrop_T(atom/movable/AM, mob/user) | ||
if(SEND_SIGNAL(usr, COMSIG_GADOM_CAN_GRAB) & GADOM_CAN_GRAB) | ||
SEND_SIGNAL(usr, COMSIG_GADOM_LOAD, user, AM) | ||
. = .. () |
31 changes: 31 additions & 0 deletions
31
modular_ss220/_signals220/code/signals_mob/signals_mob_main.dm
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 +1,32 @@ | ||
// Signals for /mob | ||
// Вызов сигнала при экипировке любой вещи | ||
/mob/equip_to_slot(obj/item/W, slot, initial = FALSE) | ||
. = ..() | ||
SEND_SIGNAL(src, COMSIG_MOB_ON_EQUIP, W, slot, initial) | ||
|
||
// Вызов сигнала при повоторе через ctrl+wasd | ||
/mob/facedir(ndir) | ||
. = ..() | ||
SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, ndir) | ||
|
||
// Вызов сигнала при повороте через ЛКМы | ||
/mob/ClickOn(atom/A, params) | ||
. = ..() | ||
SEND_SIGNAL(src, COMSIG_MOB_ON_CLICK, A, params) | ||
|
||
// Расширение для пристегивания моба | ||
/mob/MouseDrop(mob/M as mob, src_location, over_location, src_control, over_control, params) | ||
if((M != usr) || !istype(M)) | ||
..() | ||
return | ||
if(usr == src) | ||
return | ||
if(!Adjacent(usr)) | ||
return | ||
if(IsFrozen(src) && !is_admin(usr)) | ||
to_chat(usr, span_boldannounce("Interacting with admin-frozen players is not permitted.")) | ||
return | ||
if((SEND_SIGNAL(usr, COMSIG_GADOM_CAN_GRAB) & GADOM_CAN_GRAB)) | ||
SEND_SIGNAL(usr, COMSIG_GADOM_LOAD, usr, src) | ||
return | ||
. = ..() |
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,3 +1,46 @@ | ||
/obj/obj_destruction(damage_flag) | ||
SEND_SIGNAL(src, COMSIG_OBJ_DESTRUCTION, damage_flag) | ||
. = ..() | ||
|
||
/obj/item/attack(mob/living/M, mob/living/user, def_zone) | ||
. = .. () | ||
SEND_SIGNAL(src, COMSIG_MOB_ITEM_ATTACK, M, user, def_zone) | ||
|
||
/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE) | ||
. = ..() | ||
SEND_SIGNAL(src, COMSIG_LIMB_RECEIVE_DAMAGE, brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists, updating_health) | ||
|
||
/obj/item/organ/external/heal_damage(brute, burn, internal = 0, robo_repair = 0, updating_health = TRUE) | ||
. = ..() | ||
SEND_SIGNAL(src, COMSIG_LIMB_HEAL_DAMAGE, brute, burn, internal, robo_repair, updating_health) | ||
|
||
/obj/item/organ/internal/cyberimp/arm/Retract() | ||
. = .. () | ||
SEND_SIGNAL(src, COMSIG_DOUBLEIMP_SYNCHONIZE) | ||
|
||
/obj/item/organ/internal/cyberimp/arm/Extend() | ||
. = .. () | ||
SEND_SIGNAL(src, COMSIG_DOUBLEIMP_SYNCHONIZE) | ||
|
||
/obj/item/organ/internal/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0) | ||
. = .. () | ||
SEND_SIGNAL(src, COMSIG_ORGAN_GROUP_ACTION_RESORT) | ||
SEND_SIGNAL(src, COMSIG_DOUBLEIMP_ACTION_REBUILD) | ||
|
||
/obj/item/organ/internal/remove(mob/living/carbon/M, special = 0) | ||
. = .. () | ||
SEND_SIGNAL(src, COMSIG_ORGAN_GROUP_ACTION_RESORT) | ||
SEND_SIGNAL(src, COMSIG_DOUBLEIMP_ACTION_REBUILD) | ||
|
||
/obj/item/organ/internal/ui_action_click() | ||
SEND_SIGNAL(src, COMSIG_ORGAN_GROUP_ACTION_CALL, user = owner) | ||
|
||
/obj/item/organ/internal/process() | ||
SEND_SIGNAL(src, COMSIG_ORGAN_TOX_HANDLE) | ||
SEND_SIGNAL(src, COMSIG_ORGAN_ON_LIFE) | ||
. = .. () | ||
|
||
/atom/movable/screen/alert/Click() | ||
if(isliving(usr) && ..()) | ||
SEND_SIGNAL(usr, COMSIG_GADOM_UNLOAD) | ||
. = ..() |
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,5 @@ | ||
// Расширение прока на отстегивание ящика | ||
/datum/species/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style) | ||
if((SEND_SIGNAL(H, COMSIG_GADOM_CAN_GRAB) & GADOM_CAN_GRAB) && H.loaded) | ||
SEND_SIGNAL(H, COMSIG_GADOM_UNLOAD) | ||
. = .. () |
Oops, something went wrong.