cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-09-26 20:37:00 -04:00
committed by GitHub
parent 38c9174a42
commit c2a195a6c6
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/client/preference_setup/global/setting_datums.dm
View File

@@ -95,26 +95,14 @@ var/list/_client_preferences_by_type
key = "DIGEST_NOISES" key = "DIGEST_NOISES"
enabled_description = "Noisy" enabled_description = "Noisy"
disabled_description = "Silent" disabled_description = "Silent"
<<<<<<< HEAD
//CHOMPEdit; belching
/datum/client_preference/belch_noises
description = "Burping"
key = "BELCH_NOISES"
enabled_description = "Noisy"
disabled_description = "Silent"
enabled_by_default = FALSE
//CHOMPEdit end
||||||| parent of 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
=======
/datum/client_preference/belch_noises // Belching noises - pref toggle for 'em /datum/client_preference/belch_noises // Belching noises - pref toggle for 'em
description = "Burping" description = "Burping"
key = "BELCH_NOISES" key = "BELCH_NOISES"
enabled_description = "Noisy" enabled_description = "Noisy"
disabled_description = "Silent" disabled_description = "Silent"
enabled_by_default = FALSE //CHOMPedit
>>>>>>> 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
/datum/client_preference/emote_noises /datum/client_preference/emote_noises
description = "Emote Noises" //MERP description = "Emote Noises" //MERP
key = "EMOTE_NOISES" key = "EMOTE_NOISES"