diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm index b7854bf2fc3..39f8a2d66fb 100644 --- a/code/modules/client/preference/loadout/loadout_donor.dm +++ b/code/modules/client/preference/loadout/loadout_donor.dm @@ -236,6 +236,24 @@ cost = 1 allowed_roles = list(JOB_TITLE_REPRESENTATIVE) +/datum/gear/donor/strip/syndi + display_name = "strip, Syndicate" + path = /obj/item/clothing/accessory/head_strip/syndicate + donator_tier = 3 + cost = 1 + +/datum/gear/donor/strip/comrad + display_name = "strip, SSSP" + path = /obj/item/clothing/accessory/head_strip/comrad + donator_tier = 3 + cost = 1 + +/datum/gear/donor/strip/federal + display_name = "strip, TSF" + path = /obj/item/clothing/accessory/head_strip/federal + donator_tier = 3 + cost = 1 + /datum/gear/donor/heartglasses display_name = "heart-shaped glasses, color" path = /obj/item/clothing/glasses/heart diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 88ec9980b30..d9379daaec9 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -1131,6 +1131,27 @@ item_state = "ntrstrip" strip_bubble_icon = "NTR" +/obj/item/clothing/accessory/head_strip/syndicate + name = "Syndicate strip" + desc = "Круглый металлический значок тёмно-красного цвета с расположенной в центре ярко-зелёной буквой \"S\" с бордовым штырём." + icon_state = "syndistrip" + item_state = "syndistrip" + strip_bubble_icon = "Syndie" + +/obj/item/clothing/accessory/head_strip/comrad + name = "Comrade patch" + desc = "Грубый прямоугольный шеврон цвета хаки с бело-золотыми вставками по бокам и вышитой красными нитями аббревиатурой \"СССП\" в центре: стандартная нашивка, выдаваемая добровольцам." + icon_state = "patch_sssp" + item_state = "patch_sssp" + strip_bubble_icon = "comrad" + +/obj/item/clothing/accessory/head_strip/federal + name = "Federal strip" + desc = "Плотно сшитая круглая нашивка из синего бархата с белой окантовкой и золотыми вставками. По центру красуется логотип ТСФ, прошитый бело-золотыми металлическими нитями: стандартный знак отличия для граждан ТСФ." + icon_state = "stripe_federal" + item_state = "stripe_federal" + strip_bubble_icon = "federal" + /obj/item/clothing/accessory/head_strip/lawyers_badge name = "attorney's badge" desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet." diff --git a/icons/mob/clothing/ties.dmi b/icons/mob/clothing/ties.dmi index 33b0175efdb..c15d89bc040 100644 Binary files a/icons/mob/clothing/ties.dmi and b/icons/mob/clothing/ties.dmi differ diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi index 35417b389d7..4785f7b04b6 100644 Binary files a/icons/mob/talk.dmi and b/icons/mob/talk.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 8e99eb9d427..927b109e4ce 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index 914fdfff4d0..ad4e4de039a 100644 Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ diff --git a/paradise.dme b/paradise.dme index bd6f0a6c58b..1ae098c6b29 100644 --- a/paradise.dme +++ b/paradise.dme @@ -476,10 +476,10 @@ #include "code\datums\diseases\appendicitis.dm" #include "code\datums\diseases\berserker.dm" #include "code\datums\diseases\critical.dm" +#include "code\datums\diseases\ectoplasmic.dm" #include "code\datums\diseases\food_poisoning.dm" #include "code\datums\diseases\kuru.dm" #include "code\datums\diseases\vampire.dm" -#include "code\datums\diseases\ectoplasmic.dm" #include "code\datums\diseases\viruses\_virus.dm" #include "code\datums\diseases\viruses\anxiety.dm" #include "code\datums\diseases\viruses\babylon_fever.dm" @@ -1576,6 +1576,12 @@ #include "code\modules\antagonists\blob\blob_actions.dm" #include "code\modules\antagonists\blob\blob_infected_datum.dm" #include "code\modules\antagonists\blob\blob_overmind_datum.dm" +#include "code\modules\antagonists\borer\borer_action.dm" +#include "code\modules\antagonists\borer\borer_datum.dm" +#include "code\modules\antagonists\borer\borer_focus.dm" +#include "code\modules\antagonists\borer\borer_rank.dm" +#include "code\modules\antagonists\borer\borer_reagent.dm" +#include "code\modules\antagonists\borer\borer_spell.dm" #include "code\modules\antagonists\changeling\changeling_datum.dm" #include "code\modules\antagonists\changeling\changeling_power.dm" #include "code\modules\antagonists\changeling\evolution_menu.dm" @@ -1602,12 +1608,6 @@ #include "code\modules\antagonists\changeling\powers\swap_form.dm" #include "code\modules\antagonists\changeling\powers\tiny_prick.dm" #include "code\modules\antagonists\changeling\powers\transform.dm" -#include "code\modules\antagonists\borer\borer_datum.dm" -#include "code\modules\antagonists\borer\borer_rank.dm" -#include "code\modules\antagonists\borer\borer_focus.dm" -#include "code\modules\antagonists\borer\borer_reagent.dm" -#include "code\modules\antagonists\borer\borer_action.dm" -#include "code\modules\antagonists\borer\borer_spell.dm" #include "code\modules\antagonists\malf_ai\malf_ai_datum.dm" #include "code\modules\antagonists\space_dragon\action.dm" #include "code\modules\antagonists\space_dragon\carp.dm"