cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes legacy yogtoggles, mood is enabled by default. (#19591)

Browse Source 
* Moves yog's legacy toggles to non legacy, mood enabled by default

* Update quirks.dm
This commit is contained in:
John Willard
2023-07-10 18:49:21 -04:00
committed by GitHub
parent b9471c7cb3
commit 52d933c899
18 changed files with 51 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/controllers/subsystem/economy.dm
View File

@@ -168,27 +168,20 @@ SUBSYSTEM_DEF(economy)
D.adjust_money(500)
/datum/controller/subsystem/economy/proc/secmedsrv_payout()
for(var/mob/m in GLOB.mob_list)
if(isnewplayer(m))
for(var/mob/living/carbon/human/human_player in GLOB.player_list)
if(human_player.stat == DEAD)
continue
if(m.mind)
if(isbrain(m) || iscameramob(m))
continue
if(ishuman(m))
var/mob/living/carbon/human/H = m
if(H.stat != DEAD)
var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
var/medical_cash = (H.health / H.maxHealth) * alive_humans_bounty
if(mood)
var/datum/bank_account/D = get_dep_account(ACCOUNT_SRV)
if(D)
var/mood_dosh = (mood.mood_level / 9) * mood_bounty
D.adjust_money(mood_dosh)
medical_cash *= (mood.sanity / 100)
var/datum/bank_account/D = get_dep_account(ACCOUNT_MED)
if(D)
D.adjust_money(medical_cash)
var/datum/component/mood/mood = human_player.GetComponent(/datum/component/mood)
var/medical_cash = (human_player.health / human_player.maxHealth) * alive_humans_bounty
if(mood)
var/datum/bank_account/D = get_dep_account(ACCOUNT_SRV)
if(D)
var/mood_dosh = (mood.mood_level / 9) * mood_bounty
D.adjust_money(mood_dosh)
medical_cash *= (mood.sanity / 100)
var/datum/bank_account/D = get_dep_account(ACCOUNT_MED)
if(D)
D.adjust_money(medical_cash)
CHECK_TICK
var/service_passive_income = (rand(1, 6) * 400) //min 400, max 2400

2
code/controllers/subsystem/job.dm
View File

@@ -187,7 +187,7 @@ SUBSYSTEM_DEF(job)
JobDebug("FOC incompatible with antagonist role, Player: [player]")
continue
// yogs start - Donor features, quiet round
if(((job.title in GLOB.command_positions) || (job.title in GLOB.nonhuman_positions)) && (player.client.prefs.yogtoggles & QUIET_ROUND))
if(((job.title in GLOB.command_positions) || (job.title in GLOB.nonhuman_positions)) && (player.client.prefs.read_preference(/datum/preference/toggle/quiet_mode)))
JobDebug("FOC quiet check failed, Player: [player]")
continue
// yogs end

2
code/controllers/subsystem/processing/quirks.dm
View File

@@ -74,7 +74,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
prefs = client.prefs
// If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (prefs.yogtoggles & PREF_MOOD))
var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (prefs.read_preference(/datum/preference/toggle/mood_enabled)))
for (var/quirk_name in quirks)
var/datum/quirk/quirk = SSquirks.quirks[quirk_name]