diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index ba66de92de92..43fa4f803d26 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -86,6 +86,10 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) keyname = "[sheet.icon_tag("patreon")][keyname]" + if(twitch.access_rank > 0) + var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) + keyname = "[sheet.icon_tag("twitch")][keyname]" + //The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url for(var/client/receiver as anything in GLOB.clients) if(!receiver.prefs) // Client being created or deleted. Despite all, this can be null. diff --git a/icons/ui_icons/emoji/emoji.dmi b/icons/ui_icons/emoji/emoji.dmi index c4a4d3136f2b..b1fdf08427f5 100644 Binary files a/icons/ui_icons/emoji/emoji.dmi and b/icons/ui_icons/emoji/emoji.dmi differ diff --git a/monkestation/code/modules/client/preferences/inventory.dm b/monkestation/code/modules/client/preferences/inventory.dm index e4efae0bdf6c..e88372730e55 100644 --- a/monkestation/code/modules/client/preferences/inventory.dm +++ b/monkestation/code/modules/client/preferences/inventory.dm @@ -1,3 +1,5 @@ +#define DONATOR_ROUNDEND_BONUS 25 //25 monkecoin for donators + /datum/preferences/proc/load_inventory(ckey) if(!ckey || !SSdbcore.IsConnected()) return @@ -41,6 +43,14 @@ amount = max_round_coins max_round_coins -= amount + //Patreon Flat Roundend Bonus + if((parent.patreon?.has_access(2)) && donator_multipler) + amount += DONATOR_ROUNDEND_BONUS + + //Twitch Flat Roundend Bonus + if((parent.twitch?.has_access(1)) && donator_multipler) + amount += DONATOR_ROUNDEND_BONUS + //Donator Multiplier if(amount > 0 && donator_multipler) switch(parent.patreon.access_rank)