Disposals tweaks (#1058)

* funny buff * relaymove too
DaedalusDock · Aug 15, 2024 · 61d54e2 · 61d54e2
1 parent 9ea2fb5
commit 61d54e2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
@@ -301,9 +301,6 @@
 
 // handle machine interaction
 
-/obj/machinery/disposal/bin/ui_state(mob/user)
-	return GLOB.notcontained_state
-
 /obj/machinery/disposal/bin/ui_interact(mob/user, datum/tgui/ui)
 	if(machine_stat & BROKEN)
 		return

diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm
@@ -142,10 +142,14 @@
 /obj/structure/disposalholder/relaymove(mob/living/user, direction)
 	if(user.incapacitated())
 		return
-	for(var/mob/M in range(5, get_turf(src)))
-		M.show_message("<FONT size=[max(0, 5 - get_dist(src, M))]>CLONG, clong!</FONT>", MSG_AUDIBLE)
+
+	var/message = pick("CLUNK!", "CLONK!", "CLANK!", "BANG!")
+	audible_message(span_hear("[icon2html(src, hearers(src) | user)] [message]"))
 	playsound(src.loc, 'sound/effects/clang.ogg', 50, FALSE, FALSE)
 
+	var/armor = user.run_armor_check(attack_flag = BLUNT, silent = TRUE)
+	user.apply_damage(2, BRUTE, blocked = armor, spread_damage = TRUE)
+
 // called to vent all gas in holder to a location
 /obj/structure/disposalholder/proc/vent_gas(turf/T)
 	T.assume_air(gas)

diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm
@@ -83,9 +83,19 @@
 	if(H2 && !H2.active)
 		H.merge(H2)
 
-	for(var/mob/living/L in H)
-		var/armor = L.run_armor_check(attack_flag = BLUNT, silent = TRUE)
-		L.apply_damage(3, BRUTE, blocked = armor, spread_damage = TRUE)
+	if(prob(5) && (locate(/mob/living) in H))
+		var/list/mobs = list()
+
+		for(var/mob/living/L in H)
+			mobs += L
+
+		var/message = pick("CLUNK!", "CLONK!", "CLANK!", "BANG!")
+		audible_message(span_hear("[icon2html(src, hearers(src) | mobs)] [message]"))
+		playsound(src, 'sound/effects/clang.ogg', 50, FALSE, FALSE)
+
+		for(var/mob/living/L as anything in mobs)
+			var/armor = L.run_armor_check(attack_flag = BLUNT, silent = TRUE)
+			L.apply_damage(5, BRUTE, blocked = armor, spread_damage = TRUE)
 
 	H.forceMove(P)
 	return P

diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -502,7 +502,7 @@ em {
 }
 
 .hear {
-  color: #7996ff;
+  color: #b6b4a9;
   font-style: italic;
 }
 
@@ -516,7 +516,7 @@ em {
 }
 
 .unconscious {
-  color: #cac5a5;
+  color: #b6b4a9;
   font-weight: bold;
 }