Skip to content

Commit

Permalink
and you slap it with a little fishy
Browse files Browse the repository at this point in the history
  • Loading branch information
Tk420634 committed Jan 16, 2025
1 parent 317982e commit cc12dc5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
20 changes: 14 additions & 6 deletions code/controllers/subsystem/stats_attributes_skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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...",
Expand Down
2 changes: 2 additions & 0 deletions fortune13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit cc12dc5

Please sign in to comment.