Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: Spech bubble #6043

Merged
merged 15 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions code/modules/client/preference/loadout/loadout_donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions code/modules/clothing/under/accessories/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,27 @@
item_state = "ntrstrip"
strip_bubble_icon = "NTR"

/obj/item/clothing/accessory/head_strip/syndicate
name = "Syndicate strip"
desc = "Круглый металлический значок темно-красного цвета, в центре располагается ярко-зелёная буква S с бордовым штырем."
lolybomb marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "syndistrip"
item_state = "syndistrip"
strip_bubble_icon = "Syndie"

/obj/item/clothing/accessory/head_strip/comrad
name = "Comrade patch"
desc = "Грубый прямоугольный шеврон цвета хаки с бело-золотыми вставками по бокам, по центру красными нитями вышито \"СССП\". Стандартная нашивка выдающаяся добровольцам"
lolybomb marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "patch_sssp"
item_state = "patch_sssp"
strip_bubble_icon = "comrad"

/obj/item/clothing/accessory/head_strip/federal
name = "Federal strip"
desc = "Плотно сшитая круглая нашивка из синего бархата с белой окантовкой и золотыми вставками, по центру красуется логотип ТСФ прошитый бело-золотыми металлическими нитями. Стандартный знак отличия для граждан ТСФ."
lolybomb marked this conversation as resolved.
Show resolved Hide resolved
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."
Expand Down
Binary file modified icons/mob/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/mob/talk.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ties_overlay.dmi
Binary file not shown.
14 changes: 7 additions & 7 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down