diff --git a/code/controllers/subsystem/stats_attributes_skills.dm b/code/controllers/subsystem/stats_attributes_skills.dm index dda0b13e87..52ebbc7889 100644 --- a/code/controllers/subsystem/stats_attributes_skills.dm +++ b/code/controllers/subsystem/stats_attributes_skills.dm @@ -119,7 +119,7 @@ SUBSYSTEM_DEF(sas) var/mod = LAZYACCESS(split2, 2) . = list() .["DICE"] = numdice || 0 - .["SIDES"] = numsides || 0, + .["SIDES"] = numsides || 0 .["MOD"] = mod || 0 /datum/stats_and_skills @@ -268,8 +268,16 @@ SUBSYSTEM_DEF(sas) return RT /datum/statskill/proc/formattify_dice(dice) - . = replacetext(dice, "$STATMODS", "[current + get_mods()]") - . = replacetext(dice, "$STAT", "[current]") + dice = replacetext(dice, "$STATMODS", "[current + get_mods()]") + dice = replacetext(dice, "$STAT", "[current]") + return dice + +/datum/statskill/proc/formattify(phrase) + var/mob/whom = get_owner() + phrase = replacetext(phrase, "%MOBNAME", "[whom.name]") + phrase = replacetext(phrase, "%MOBTHEIR", "[whom.p_their()]") + phrase = replacetext(phrase, "%MOBTHEY", "[whom.p_they()]") + return phrase /datum/statskill/proc/get_mods() . = 0 @@ -281,9 +289,9 @@ SUBSYSTEM_DEF(sas) displayname = "Strength" is_stat = TRUE rollmote_triggers = list( - "b" - "brn" - "brawn" + "b", + "brn", + "brawn", ) rollmote_initial = list( "%MOBNAME tests %MOBTHEIR brawn...", diff --git a/fortune13.dme b/fortune13.dme index d4f12f6342..f83c6feb39 100644 --- a/fortune13.dme +++ b/fortune13.dme @@ -130,6 +130,7 @@ #include "code\__DEFINES\stat.dm" #include "code\__DEFINES\stat_tracking.dm" #include "code\__DEFINES\statpanel.dm" +#include "code\__DEFINES\stats_and_skills.dm" #include "code\__DEFINES\status_effects.dm" #include "code\__DEFINES\subsystems.dm" #include "code\__DEFINES\tattoo_defines.dm" @@ -400,6 +401,7 @@ #include "code\controllers\subsystem\shuttle.dm" #include "code\controllers\subsystem\sounds.dm" #include "code\controllers\subsystem\statpanel.dm" +#include "code\controllers\subsystem\stats_attributes_skills.dm" #include "code\controllers\subsystem\stickyban.dm" #include "code\controllers\subsystem\sun.dm" #include "code\controllers\subsystem\tgui.dm"