Merge pull request #179 from KnigTheThrasher/muteupgrade

Lets mute people make audible sounds, disables unused maps and broken scanner gate feature
IrisSS13 · Dec 30, 2024 · e32e481 · e32e481
2 parents be10eed + 40e80b8
commit e32e481
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/_maps/biodome.json → _maps/biodome.json.unused b/_maps/biodome.json → _maps/biodome.json.unused
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
@@ -389,8 +389,11 @@
  */
 /datum/emote/proc/should_play_sound(mob/user, intentional = FALSE)
 	if(emote_type & EMOTE_AUDIBLE && !hands_use_check)
+	//IRIS REMOVAL
+	/*
 		if(HAS_TRAIT(user, TRAIT_MUTE))
 			return FALSE
+	*/
 		if(ishuman(user))
 			var/mob/living/carbon/human/loud_mouth = user
 			if(HAS_MIND_TRAIT(loud_mouth, TRAIT_MIMING)) // vow of silence prevents outloud noises

diff --git a/config/maps.txt b/config/maps.txt
@@ -26,9 +26,9 @@ map kilostation
 	minplayers 0
 endmap
 
-map biodome
-	votable
-endmap
+#map biodome
+#	votable
+#endmap
 
 map deltastation
 	minplayers 50

diff --git a/tgui/packages/tgui/interfaces/ScannerGate.jsx b/tgui/packages/tgui/interfaces/ScannerGate.jsx
@@ -67,11 +67,14 @@ const SCANNER_GATE_ROUTES = {
     title: 'Scanner Mode: Nutrition',
     component: () => ScannerGateNutrition,
   },
+  // IRIS REMOVAL - BROKEN FEATURE, FIX IT
+  /*
   //  NOVA EDIT START - MORE SCANNER GATE OPTIONS
   Gender: {
     title: 'Scanner Mode: Gender',
     component: () => ScannerGateGender,
   },
+  */
   //  NOVA EDIT END - MORE SCANNER GATE OPTIONS
 };
 
@@ -124,10 +127,6 @@ const ScannerGateOff = (props) => {
           content="Species"
           onClick={() => act('set_mode', { new_mode: 'Species' })}
         />
-        <Button //  NOVA EDIT START - MORE SCANNER GATE OPTIONS
-          content="Gender"
-          onClick={() => act('set_mode', { new_mode: 'Gender' })} //  NOVA EDIT END - MORE SCANNER GATE OPTIONS
-        />
         <Button
           content="Nutrition"
           onClick={() => act('set_mode', { new_mode: 'Nutrition' })}
@@ -137,6 +136,13 @@ const ScannerGateOff = (props) => {
   );
 };
 
+/* IRIS REMOVAL - BROKEN FEATURE, FIX IT, WAS IN LINE 134
+<Button //  NOVA EDIT START - MORE SCANNER GATE OPTIONS
+content="Gender"
+onClick={() => act('set_mode', { new_mode: 'Gender' })} //  NOVA EDIT END - MORE SCANNER GATE OPTIONS
+/>
+*/
+
 const ScannerGateWanted = (props) => {
   const { data } = useBackend();
   const { reverse } = data;
@@ -272,7 +278,8 @@ const ScannerGateNutrition = (props) => {
     </>
   );
 };
-
+// IRIS EDIT - BROKEN FEATURE, SOMEONE FIX IT
+/*
 //  NOVA EDIT START - MORE SCANNER GATE OPTIONS
 const ScannerGateGender = (props) => {
   const { act, data } = useBackend();
@@ -303,6 +310,7 @@ const ScannerGateGender = (props) => {
     </>
   );
 };
+*/
 //  NOVA EDIT END - MORE SCANNER GATE OPTIONS
 const ScannerGateMode = (props) => {
   const { act, data } = useBackend();