From 5177d4e194f7c6493073f8e83164c68d3da63d71 Mon Sep 17 00:00:00 2001 From: Furior <68264134+Furrior@users.noreply.github.com> Date: Mon, 4 Sep 2023 09:55:23 +0700 Subject: [PATCH] Arofl: badges (#154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает ## Почему это хорошо для игры ## Изображения изменений ## Тестирование ## Changelog :cl: add: Добавлены новые баджи в OOC для донатеров и стаффа /:cl: --- code/__DEFINES/_ss220.dm | 1 + code/game/verbs/ooc.dm | 6 +++ modular_ss220/chat_badges/_chat_badges.dm | 4 ++ modular_ss220/chat_badges/_chat_badges.dme | 3 ++ modular_ss220/chat_badges/code/badges.dm | 44 ++++++++++++++++++ .../chat_badges/icons/chatbadges.dmi | Bin 0 -> 1454 bytes modular_ss220/modular_ss220.dme | 3 ++ paradise.dme | 1 + 8 files changed, 62 insertions(+) create mode 100644 code/__DEFINES/_ss220.dm create mode 100644 modular_ss220/chat_badges/_chat_badges.dm create mode 100644 modular_ss220/chat_badges/_chat_badges.dme create mode 100644 modular_ss220/chat_badges/code/badges.dm create mode 100644 modular_ss220/chat_badges/icons/chatbadges.dmi diff --git a/code/__DEFINES/_ss220.dm b/code/__DEFINES/_ss220.dm new file mode 100644 index 000000000000..203e016a313f --- /dev/null +++ b/code/__DEFINES/_ss220.dm @@ -0,0 +1 @@ +#define MODPACK_CHAT_BADGES diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 5ef95703e25b..c1190098c33d 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -75,6 +75,10 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") for(var/client/C in GLOB.clients) if(C.prefs.toggles & PREFTOGGLE_CHAT_OOC) + // SS220 MODPACK REPLACE START + #ifdef MODPACK_CHAT_BADGES + var/display_name = get_ooc_badged_name() + #else var/display_name = key if(prefs.unlock_content) @@ -87,6 +91,8 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") var/icon/donator = icon('icons/ooc_tag_16x.png') display_name = "[bicon(donator)][display_name]" + #endif + // SS220 MODPACK REPLACE END if(holder) if(holder.fakekey) if(C.holder && C.holder.rights & R_ADMIN) diff --git a/modular_ss220/chat_badges/_chat_badges.dm b/modular_ss220/chat_badges/_chat_badges.dm new file mode 100644 index 000000000000..a343b6d9bda4 --- /dev/null +++ b/modular_ss220/chat_badges/_chat_badges.dm @@ -0,0 +1,4 @@ +/datum/modpack/chat_badges + name = "Chat badges" + desc = "Добавляет иконки в OOC для различных ролей" + author = "furior" diff --git a/modular_ss220/chat_badges/_chat_badges.dme b/modular_ss220/chat_badges/_chat_badges.dme new file mode 100644 index 000000000000..d6350942a883 --- /dev/null +++ b/modular_ss220/chat_badges/_chat_badges.dme @@ -0,0 +1,3 @@ +#include "_chat_badges.dm" + +#include "code/badges.dm" diff --git a/modular_ss220/chat_badges/code/badges.dm b/modular_ss220/chat_badges/code/badges.dm new file mode 100644 index 000000000000..10e3f4fe721a --- /dev/null +++ b/modular_ss220/chat_badges/code/badges.dm @@ -0,0 +1,44 @@ +#define CHAT_BADGES_DMI 'modular_ss220/chat_badges/icons/chatbadges.dmi' + +/client/proc/get_ooc_badged_name() + . = key + if(donator_level && (prefs.toggles & PREFTOGGLE_DONATOR_PUBLIC)) + var/icon/donator = icon(CHAT_BADGES_DMI, donator_level > 3 ? "Trusted" : "Paradise") + . = "[bicon(donator)][.]" + + if(prefs.unlock_content) + if(prefs.toggles & PREFTOGGLE_MEMBER_PUBLIC) + var/icon/palm = icon(CHAT_BADGES_DMI, "Trusted") + . = "[bicon(palm)][.]" + + if(!holder) + return + + // Config disallows using Russian so this is the way + var/rank + switch(holder.rank) + if("Хост") + rank = "Host" + if("Ведущий Разработчик") + rank = "HeadDeveloper" + if("Старший Администратор") + rank = "HeadAdmin" + if("Банда") + rank = "Streamer" + if("Админ") + rank = "GameAdmin" + if("Триал Админ") + rank = "TrialAdmin" + if("Ментор") + rank = "Mentor" + if("Разработчик") + rank = "Developer" + if("Маппер") + rank = "Mapper" + if("Спрайтер") + rank = "Spriceter" + + var/icon/rank_badge = icon(CHAT_BADGES_DMI, rank) + . = "[bicon(rank_badge)][.]" + +#undef CHAT_BADGES_DMI diff --git a/modular_ss220/chat_badges/icons/chatbadges.dmi b/modular_ss220/chat_badges/icons/chatbadges.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b4ae6ba658278d3262beee778f52fb1d7dadf55a GIT binary patch literal 1454 zcmV;f1yTBmP)IHRRjRPfdBuy zGv_%usR#g>GyngU0L%aYbq4_e007yw0L*s)DO08ZfGhvzX8*51XPo{3xj+BgCMu^Rk;&A%@sqyz`!K4gSitg{~17$4<#R&aJds9{~0Zj4;r}>6aN_*kq-~e zB^CcI8Ic+f%`_GNKpBxG56wdr|5F)}Fb~aA75`=#kvb2}Vio^+8IeT~&2bg~j2V$o z56yrT|DPF=TMx~U75}ptk!BCMkQ4vL8If@hxtV=-0C=30(yq^W(4$UO@a=TiK?s#JaLg!nfPX4}A!OLH`|2N9H8RfP&Q~TRF>oKCZ*NEaiBZ~Wt*gs$dLhlD75c)nEfzbcSsGt266$tPT zk_x(j0RIrFpbH4_50eVI5TR$F5>yoeh~EnV0P%Yv03d!Z1OcSktOE)}g#mDE030^} z0v!qvVxfQ-D&eG;P{0e(0k7GfMe4Gjx_@p{Rx22 zQH9eUAVw8Vdw>{KIPF0|4z!2~Kz{T=SAqQKgRTPk(Fa|H3UUZ>k_aIFL7fBf59u6; ze|XpcDxqQl>W={RM}YbT@boATHjVO7(T@;H#MA zY63W4EgAuy4qpd&I(!{KZrTh9Q1y)f?+D<00(eIN=M$ii1aRMa2K;o10P@rQL0|y+ z>HZ)vpm2p`fPXXt;$ce=z*Fv%4Dkf;l=~Dzd;~ao47mhA21Kk1fKulMAQb{o>f8XN zk^uTF)C`b7%7BY!h?5eW7XV6$Jy8F|QyFmaURo(lbi4%Aint0z@=w?v)B$LKlP<(% zbkqW8=0JL22B~2cUK^w~N4f3I)c$tPYDN@KPk)b^p3X|BHe&?B?A+Yk4~Q;vv!(n$ zRUphSEG#V2qn<8{3-cua1IV+L z0UMiJVN1`=jeiDg@9ga22)lglY?lMbuW<(K{et$xK3#F{mFxkY)v<{OhtN?tIusq0 z1jrf?;P?bO4W}ofILdeT_w`?{_xE?N0$MiHLoj-H-QT*MAO9phKECe$3m82XxfXSZUH||907*qo IM6N<$f|*N(IRF3v literal 0 HcmV?d00001 diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index c50c95a591bb..cf4d4960393a 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -12,6 +12,9 @@ // --- ICONS --- // #include "aesthetics/_aesthetics.dme" +#ifdef MODPACK_CHAT_BADGES +#include "chat_badges/_chat_badges.dme" +#endif #include "hairs/_hairs.dme" // --- OBJECTS --- // diff --git a/paradise.dme b/paradise.dme index f9a2f71b3b80..000c0cef3680 100644 --- a/paradise.dme +++ b/paradise.dme @@ -24,6 +24,7 @@ #include "code\__DEFINES\_protection.dm" #include "code\__DEFINES\_readme.dm" #include "code\__DEFINES\_spacemandmm.dm" +#include "code\__DEFINES\_ss220.dm" // SS220 ADDITION : MODPACK TOGGLING #include "code\__DEFINES\_tgs_defines.dm" #include "code\__DEFINES\_tick.dm" #include "code\__DEFINES\_versions.dm"