Merge branch 'master' of https://github.com/KabKebab/GS13 into prosthetic

code/__DEFINES/citadel_defines.dm

@@ -125,15 +125,19 @@
 #define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
 #define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
 
-#define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob
+#define CRAWLUNDER_DELAY					30 //Delay for crawling under a standing mob
 
 //Citadel toggles because bitflag memes
 #define MEDIHOUND_SLEEPER	(1<<0)
-#define EATING_NOISES		(1<<1)
-#define DIGESTION_NOISES	(1<<2)
-#define TRASH_FORCEFEED		(1<<3)
+#define EATING_NOISES		(1<<1) //Vore
+#define DIGESTION_NOISES	(1<<2) //Vore
 
-#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES)
+#define TRASH_FORCEFEED		(1<<3) //GS13
+#define FARTING_NOISES		(1<<4) //GS13
+#define BURPING_NOISES		(1<<5) //GS13
+
+//toggles on by default
+#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|FARTING_NOISES|BURPING_NOISES)
 
 //component stuff
 #define COMSIG_COMBAT_TOGGLED "combatmode_toggled" //called by combat mode toggle on all equipped items. args: (mob/user, combatmode)

code/__DEFINES/sound.dm

@@ -10,7 +10,6 @@
 #define CHANNEL_BUZZ 1018
 #define CHANNEL_BICYCLE 1017
 
-
 //CIT CHANNELS - TRY NOT TO REGRESS
 #define CHANNEL_PRED 1010
 #define CHANNEL_DIGEST 1009
@@ -19,17 +18,17 @@
 //Hyperstation Channels
 #define CHANNEL_REACTOR_ALERT 1007 // reactor sounds
 
+//GS13 Channels
+#define CHANNEL_BURP 1006
+#define CHANNEL_FART 1005
 
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
-
-#define CHANNEL_HIGHEST_AVAILABLE 1006 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS
-
+#define CHANNEL_HIGHEST_AVAILABLE 1004
 
 #define SOUND_MINIMUM_PRESSURE 10
 #define FALLOFF_SOUNDS 1
 
-
 //Ambience types
 
 #define GENERIC list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\
@@ -136,4 +135,4 @@
 
 #define PICKUP_SOUND_VOLUME 40
 #define DROP_SOUND_VOLUME 50
-#define YEET_SOUND_VOLUME 90
+#define YEET_SOUND_VOLUME 90

code/game/area/areas/ruins/lavaland.dm

@@ -93,3 +93,12 @@
 //ash walker nest
 /area/ruin/unpowered/ash_walkers
 	icon_state = "red"
+
+
+
+
+// GS13 CONTENT STARTS HERE!!!
+
+/area/ruin/unpowered/caloriteshrine
+	name = "Calorite Shrine"
+	icon_state = "away"

code/modules/client/preferences.dm

@@ -1021,15 +1021,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Exhibitionist:</b><a href='?_src_=prefs;preference=exhibitionist'>[features["exhibitionist"] == TRUE ? "Yes" : "No"]</a><BR>"
 			dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Allow trash forcefeeding (requires Trashcan quirk)</b> <a href='?_src_=prefs;preference=toggleforcefeedtrash'>[(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Lewdchem:</b><a href='?_src_=prefs;preference=lewdchem'>[lewdchem == TRUE ? "Enabled" : "Disabled"]</a><BR>"
 			dat += "<b>Widescreen:</b> <a href='?_src_=prefs;preference=widescreenpref'>[widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]</a><br>"
 			dat += "<b>Auto stand:</b> <a href='?_src_=prefs;preference=autostand'>[autostand ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
 			if (user && user.client && !user.client.prefs.screenshake==0)
 				dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
-			//GS13 stuff goes here
+
+			//GS13
 			dat += "<h2>GS13 Preferences</h2>"
+			dat += "<b>Hear Burp Sounds:</b> <a href='?_src_=prefs;preference=toggleburpingnoise'>[(cit_toggles & BURPING_NOISES) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Hear Fart Sounds:</b> <a href='?_src_=prefs;preference=togglefartingnoise'>[(cit_toggles & FARTING_NOISES) ? "Yes" : "No"]</a><br>"
+			dat += "<b>Trashcan Forcefeeding:</b> <a href='?_src_=prefs;preference=toggleforcefeedtrash'>[(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]</a><br>"
 
 			dat += "<b>Maximum Weight:</b><a href='?_src_=prefs;preference=max_fatness'>[max_weight == FALSE ? "None" : max_weight]</a><BR>"
 			dat += "<b>NonCon - Weight Gain:</b><a href='?_src_=prefs;preference=noncon_weight_gain'>[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]</a><BR>"
@@ -2797,14 +2800,16 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				// Citadel edit - Prefs don't work outside of this. :c
 				if("hound_sleeper")
 					cit_toggles ^= MEDIHOUND_SLEEPER
-
 				if("toggleeatingnoise")
 					cit_toggles ^= EATING_NOISES
-
 				if("toggledigestionnoise")
 					cit_toggles ^= DIGESTION_NOISES
-				if("toggleforcefeedtrash") //gs13 added for flint
+				if("toggleforcefeedtrash") //GS13
 					cit_toggles ^= TRASH_FORCEFEED
+				if("toggleburpingnoise") //GS13
+					cit_toggles ^= BURPING_NOISES
+				if("togglefartingnoise") //GS13
+					cit_toggles ^= FARTING_NOISES
 				//END CITADEL EDIT
 
 				if("ambientocclusion")

code/modules/mob/living/emote.dm

@@ -16,18 +16,6 @@
 	message_param = "bows to %t."
 	restraint_check = TRUE
 
-/datum/emote/living/burp
-	key = "burp"
-	key_third_person = "burps"
-	message = "burps."
-	emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/belch
-	key = "belch"
-	key_third_person = "belches loudly"
-	message = "belches."
-	emote_type = EMOTE_AUDIBLE
-
 /datum/emote/living/choke
 	key = "choke"
 	key_third_person = "chokes"