| || || |_

UPPERTEXT... erecting a dispenser fasfasfsa а
GesuArchive · Feb 15, 2022 · aafee51 · aafee51
1 parent 7632459
commit aafee51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm
@@ -51,5 +51,5 @@
 	log_wound(victim, src)
 	if(wounding_type != WOUND_BURN && victim.blood_volume)
 		victim.spray_blood(attack_direction, severity)
-	dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE, TRUE, wounding_type == WOUND_BLUNT ? FALSE : TRUE)
+	dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE, TRUE, (wounding_type != WOUND_BLUNT) )
 	qdel(src)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -22,10 +22,6 @@
 			C.visible_message(span_danger("<B>[capitalize(src.name)] [C] разлетается на кусочки!</B>"))
 	INVOKE_ASYNC(C, /mob.proc/emote, "agony")
 	SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
-	if(detach_limb)
-		playsound(get_turf(C), 'sound/effects/dismember.ogg', 80, TRUE)
-	else
-		playsound(get_turf(C), 'white/valtos/sounds/gibpart.ogg', 80, TRUE)
 
 	drop_limb()
 
@@ -47,9 +43,12 @@
 		bleeding_chest.force_wound_upwards(/datum/wound/slash/critical)
 
 	if(!detach_limb)
+		playsound(get_turf(C), 'white/valtos/sounds/gibpart.ogg', 80, TRUE)
 		new /obj/effect/decal/cleanable/blood/gibs(location, C.get_static_viruses())
+		drop_organs(null, TRUE)
 		qdel(src)
 		return TRUE
+	playsound(get_turf(C), 'sound/effects/dismember.ogg', 80, TRUE)
 	var/direction = pick(GLOB.cardinals)
 	var/t_range = rand(2,max(throw_range/2, 2))
 	var/turf/target_turf = get_turf(src)

diff --git a/white/hule/wordlist.dm b/white/hule/wordlist.dm
@@ -31,7 +31,9 @@ GLOBAL_LIST_INIT(exc_full, world.file2list("cfg/autoeban/exc_full.fackuobema"))
 
 
 			target.client.bad_word_counter += 1
-			message_admins("[ADMIN_LOOKUPFLW(target)], возможно, насрал на ИЦ словом \"[bad_word]\". Это его [target.client.bad_word_counter]-й раз.<br>(<u>[strip_html(msg)]</u>) [ADMIN_SMITE(target)] [target.client.bad_word_counter > 1 ? "Возможно, он заслужил смайт." : ""]")
+			to_chat(target, span_boldnotice(target.client.bad_word_counter == 1 ?	 "...Возможно, мне не стоит говорить такие \"смешные\" слова, как \"[uppertext(bad_word)]\"..." : \
+																					"...Чувствую, что мне за \"[uppertext(bad_word)]\" скоро влетит..."))
+			message_admins("[ADMIN_LOOKUPFLW(target)], возможно, насрал на ИЦ словом \"[bad_word]\". Это его [target.client.bad_word_counter]-й раз в этом раунде.<br>(<u>[strip_html(msg)]</u>) [ADMIN_SMITE(target)] [target.client.bad_word_counter > 1 ? "Возможно, он заслужил смайт." : ""]")
 			return
 	return