fix linter for sure

ss220club · Oct 19, 2023 · f7bfc0f · f7bfc0f
1 parent e88c5c0
commit f7bfc0f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/modular_ss220/emotes/code/emote_panel.dm b/modular_ss220/emotes/code/emote_panel.dm
@@ -40,12 +40,10 @@
 			var/useTarget = params["useTarget"]
 			var/datum/emote/emote = new emote_path()
 			var/emote_act = emote.key
-			if(!emote_act)
-				return
 			var/emote_param
 			if(emote.message_param && useTarget == "true")
 				emote_param = input(usr, "Дополните эмоцию", emote.message_param)
-			usr.emote(emote_key = emote_act, message = emote_param, intentional = TRUE)
+			usr.emote(emote_act, message = emote_param, intentional = TRUE)
 
 /datum/emote_panel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
 	ui = SStgui.try_update_ui(user, src, ui)

diff --git a/modular_ss220/mobs/code/simple_animal/friendly/frog.dm b/modular_ss220/mobs/code/simple_animal/friendly/frog.dm
@@ -122,25 +122,25 @@
 			custom_emote(1,"издаёт боевой клич!")
 			playsound(src, pick(src.scream_sound), 50, TRUE)
 
-/mob/living/simple_animal/frog/emote(act, m_type = 1, message = null, intentional, force)
+/mob/living/simple_animal/frog/emote(emote_key, type_override = 1, message, intentional, force_silence)
 	if(incapacitated())
 		return
 
 	var/on_CD = 0
-	act = lowertext(act)
-	switch(act)
+	emote_key = lowertext(emote_key)
+	switch(emote_key)
 		if("warcry")
 			on_CD = start_audio_emote_cooldown()
 		else
 			on_CD = 0
 
-	if(!force && on_CD == 1)
+	if(!force_silence && on_CD == 1)
 		return
 
-	switch(act)
+	switch(emote_key)
 		if("warcry")
 			message = "издаёт боевой клич!"
-			m_type = 2 //audible
+			type_override = 2 //audible
 			playsound(src, pick(src.scream_sound), 50, TRUE)
 		if("help")
 			to_chat(src, "warcry")

diff --git a/modular_ss220/mobs/code/simple_animal/hostile/syndi_rat.dm b/modular_ss220/mobs/code/simple_animal/hostile/syndi_rat.dm
@@ -92,25 +92,25 @@
 			to_chat(M, "<span class='notice'>[bicon(src)] Squeek!</span>")
 	..()
 
-/mob/living/simple_animal/hostile/retaliate/syndirat/emote(act, m_type = 1, message = null, intentional, force)
+/mob/living/simple_animal/hostile/retaliate/syndirat/emote(emote_key, type_override = 1, message, intentional, force_silence)
 	if(stat != CONSCIOUS)
 		return
 
 	var/on_CD = 0
-	act = lowertext(act)
-	switch(act)
+	emote_key = lowertext(emote_key)
+	switch(emote_key)
 		if("squeak")		//Mouse time
 			on_CD = start_audio_emote_cooldown()
 		else
 			on_CD = 0
 
-	if(!force && on_CD == 1)
+	if(!force_silence && on_CD == 1)
 		return
 
-	switch(act)
+	switch(emote_key)
 		if("squeak")
 			message = "[pick(emote_hear)]!"
-			m_type = 2 //audible
+			type_override = 2 //audible
 			playsound(src, squeak_sound, 40, 1)
 		if("help")
 			to_chat(src, "scream, squeak")

diff --git a/modular_ss220/mobs/code/simple_animal/pets/rouge.dm b/modular_ss220/mobs/code/simple_animal/pets/rouge.dm
@@ -39,15 +39,15 @@
 	visible_message("[src] [pick("dances around", "chases [p_their()] tail")].", "[pick("You dance around", "You chase your tail")].")
 	spin(20, 1)
 
-/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/emote(act, m_type = 1, message = null, intentional, force)
+/mob/living/simple_animal/hostile/retaliate/poison/snake/rouge/emote(emote_key, type_override = 1, message, intentional, force_silence)
 	if(incapacitated())
 		return
 
-	act = lowertext(act)
-	if(!force && act == "hiss" && start_audio_emote_cooldown())
+	emote_key = lowertext(emote_key)
+	if(!force_silence && emote_key == "hiss" && start_audio_emote_cooldown())
 		return
 
-	switch(act)
+	switch(emote_key)
 		if("hiss")
 			message = "<B>[src]</B> [pick(src.speak_emote)]!"
 	..()