Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

code/modules/admin/admin.dm

@@ -15,6 +15,15 @@ var/global/BSACooldown = 0
 				msg = dd_replacetext(msg, "%holder_ref%", "\ref[C.holder]")
 			C << msg
 
+/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
+	var/rendered = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[text]</span></span>"
+	log_adminwarn(rendered)
+	for (var/client/C in admin_list)
+		if (C)
+			if(!C.STFU_atklog)
+				var/msg = rendered
+				C << msg
+
 
 /obj/admins/Topic(href, href_list)
 	..()

code/modules/admin/admin_verbs.dm

@@ -742,6 +742,16 @@
 	usr << "You will now [STFU_radio ? "not hear" : "hear"] radio chatter from nearby radios or speakers"
 	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/toggle_hear_atklog()
+	set name = "Toggle Hear Attacks"
+	set category = "Admin"
+
+	if(!holder) return
+	STFU_atklog = !STFU_atklog
+	usr << "You will now [STFU_atklog ? "not hear" : "hear"] attack logs"
+	feedback_add_details("admin_verb","THAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
 /client/proc/deadmin_self()
 	set name = "De-admin self"
 	set category = "Admin"

code/modules/chemical/Chemistry-Tools.dm

@@ -3971,11 +3971,11 @@ var/list/grind_products = list()
 				if("bananahonk")
 					icon_state = "bananahonkglass"
 					name = "Banana Honk"
-					desc = "A drink from Clown Heaven."
+					desc = "A drink from Banana Heaven."
 				if("silencer")
 					icon_state = "silencerglass"
 					name = "Silencer"
-					desc = "A drink from mime Heaven."
+					desc = "A drink from silent Heaven."
 				if("nothing")
 					icon_state = "nothing"
 					name = "Nothing"

code/modules/client/client defines.dm

@@ -41,6 +41,7 @@
 	var/activeslot		= 1		//Default active slot!
 	var/STFU_ghosts				//80+ people rounds are fun to admin when text flies faster than airport security
 	var/STFU_radio				//80+ people rounds are fun to admin when text flies faster than airport security
+	var/STFU_atklog
 
 		///////////////
 		//SOUND STUFF//
@@ -55,7 +56,7 @@
 		////////////
 	var/next_allowed_topic_time = 10
 	// comment out the line below when debugging locally to enable the options & messages menu
-	control_freak = 1
+	//control_freak = 1
 
 
 

code/modules/clothing/head/jobs.dm

@@ -43,7 +43,7 @@
 //Mime
 /obj/item/clothing/head/beret
 	name = "beret"
-	desc = "A beret, a mime's favorite headwear."
+	desc = "A beret, an artists favorite headwear."
 	icon_state = "beret"
 	flags = FPRINT | TABLEPASS
 

code/modules/food/food.dm

@@ -541,7 +541,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/pie
 	name = "Banana Cream Pie"
-	desc = "Just like back home, on clown planet! HONK!"
+	desc = "Just like back home!"
 	icon_state = "pie"
 	trash = /obj/item/trash/plate
 
@@ -1739,7 +1739,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
 	name = "Birthday Cake"
-	desc = "Happy Birthday little clown..."
+	desc = "Happy Birthday..."
 	icon_state = "birthdaycake"
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
 	slices_num = 5

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -20,7 +20,8 @@
 					M.attack_log += text("\[[time_stamp()]\] <font color='red'>Stungloved [src.name] ([src.ckey])</font>")
 					src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stungloved by [M.name] ([M.ckey])</font>")
 
-
+					log_admin("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])")
+					msg_admin_attack("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])") //BS12 EDIT ALG
 					log_attack("<font color='red'>[M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])</font>")
 
 
@@ -59,10 +60,10 @@
 
 	switch(M.a_intent)
 		if("help")
-			if(health > 0)
+			if(health > config.health_threshold_crit)
 				help_shake_act(M)
 				return 1
-			if(M.health < -75)	return 0
+//			if(M.health < -75)	return 0
 
 			if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
 				M << "\blue <B>Remove your mask!</B>"
@@ -112,7 +113,9 @@
 				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Used Electric Hands nanoaug power on [src.name] ([src.ckey])</font>")
 				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been shocked by [M.name] with the Electric Hands nanoaug ([M.ckey])</font>")
 
-				log_attack("<font color='red'>[M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name], shocking them ([src.ckey])</font>")
+				log_admin("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them")
+				msg_admin_attack("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them") //BS12 EDIT ALG
+				log_attack("<font color='red'>[M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name]([src.ckey]), shocking them </font>")
 
 
 				var/armorblock = run_armor_check(M.zone_sel.selecting, "energy")
@@ -120,28 +123,32 @@
 
 				return
 
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Punched [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been punched by [M.name] ([M.ckey])</font>")
-
-			log_attack("<font color='red'>[M.name] ([M.ckey]) punched [src.name] ([src.ckey])</font>")
-
-
 			var/attack_verb
 			if(M.dna)
 				switch(M.dna.mutantrace)
 					if("lizard")
 						attack_verb = "scratch"
+					if("tajaran")
+						attack_verb = "scratch"
 					if("plant")
 						attack_verb = "slash"
 					else
 						attack_verb = "punch"
 
+			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[attack_verb]ed [src.name] ([src.ckey])</font>")
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [attack_verb]ed by [M.name] ([M.ckey])</font>")
 
-			var/damage = rand(0, 9)
+			log_admin("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])")
+			msg_admin_attack("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])") //BS12 EDIT ALG
+			log_attack("<font color='red'>[M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])</font>")
+
+			var/damage = rand(0, 5)//BS12 EDIT
 			if(!damage)
 				switch(attack_verb)
 					if("slash")
 						playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
+					if("scratch")
+						playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 					else
 						playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
 
@@ -154,25 +161,28 @@
 
 			if(HULK in M.mutations)			damage += 5
 			if(SUPRSTR in M.augmentations) 	damage += 5
+			if(attack_verb == "scratch")	damage += 5
 
 			switch(attack_verb)
 				if("slash")
 					playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+				if("scratch")
+					playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 				else
 					playsound(loc, "punch", 25, 1, -1)
 
 			visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
 
 			apply_damage(damage, BRUTE, affecting, armor_block)
-			if(damage >= 9)
+			if(damage >= 5 && prob(50))
 				visible_message("\red <B>[M] has weakened [src]!</B>")
-				apply_effect(4, WEAKEN, armor_block)
+				apply_effect(2, WEAKEN, armor_block)
 
 		if("disarm")
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Disarmed [src.name] ([src.ckey])</font>")
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been disarmed by [M.name] ([M.ckey])</font>")
 
-
+			log_admin("ATTACK: [M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])")
 			log_attack("<font color='red'>[M.name] ([M.ckey]) disarmed [src.name] ([src.ckey])</font>")
 
 
@@ -181,7 +191,7 @@
 			var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
 			var/randn = rand(1, 100)
 			if (randn <= 25)
-				apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
+				apply_effect(4, WEAKEN, run_armor_check(affecting, "melee"))
 				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 				visible_message("\red <B>[M] has pushed [src]!</B>")
 				return

code/modules/mob/living/carbon/human/update_icons.dm

@@ -305,12 +305,17 @@ Please contact me on #coderbus IRC. ~Carn x
 	var/fat
 	if( FAT in mutations )
 		fat = "fat"
-
+	var/g = "m"
+	if (gender == FEMALE)	g = "f"
+//BS12 EDIT
 	if(dna)
 		switch(dna.mutantrace)
-			if("lizard","golem","metroid")
+			if("golem","metroid")
 				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_l")
 				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_s")
+			if("lizard", "tajaran", "skrell")
+				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
+				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
 			if("plant")
 				if(stat == DEAD)	//TODO
 					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")

code/modules/mob/living/silicon/ai/ai.dm

@@ -105,10 +105,10 @@
 		return
 
 		//if(icon_state == initial(icon_state))
-	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
-	if(icontype == "Clown")
-		icon_state = "ai-clown2"
-	else if(icontype == "Monochrome")
+	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Monochrome", "Blue", "Inverted", "Firewall", "Green", "Red", "Static")
+/*	if(icontype == "Clown")
+		icon_state = "ai-clown2"*/
+	if(icontype == "Monochrome")
 		icon_state = "ai-mono"
 	else if(icontype == "Blue")
 		icon_state = "ai"

code/modules/paperwork/paper.dm

@@ -284,7 +284,7 @@
 				overlays += "paper_stamped_denied"
 			if(/obj/item/weapon/stamp/clown)
 				if (!clown)
-					usr << "<span class='notice'>You are totally unable to use the stamp. HONK!</span>"
+					usr << "<span class='notice'>You are unable to use the stamp.</span>"
 					return
 				else
 					overlays += "paper_stamped_clown"

code/modules/projectiles/projectile/energy.dm

@@ -16,7 +16,7 @@
 
 
 /obj/item/projectile/energy/declone
-	name = "declown"
+	name = "declone"
 	icon_state = "declone"
 	nodamage = 1
 	damage_type = CLONE

code/modules/reagents/Chemistry-Reagents.dm

@@ -3890,7 +3890,7 @@ datum
 		bananahonk
 			name = "Banana Mama"
 			id = "bananahonk"
-			description = "A drink from Clown Heaven."
+			description = "A drink from Banana Heaven."
 			nutriment_factor = 1 * REAGENTS_METABOLISM
 			color = "#664300" // rgb: 102, 67, 0
 
@@ -3924,7 +3924,7 @@ datum
 		silencer
 			name = "Silencer"
 			id = "silencer"
-			description = "A drink from Mime Heaven."
+			description = "A drink from Silent Heaven."
 			nutriment_factor = 1 * REAGENTS_METABOLISM
 			color = "#664300" // rgb: 102, 67, 0
 

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -369,7 +369,7 @@
 				if("bananahonk")
 					icon_state = "bananahonkglass"
 					name = "Banana Honk"
-					desc = "A drink from Clown Heaven."
+					desc = "A drink from Banana Heaven."
 				if("silencer")
 					icon_state = "silencerglass"
 					name = "Silencer"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1940,7 +1940,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
 	name = "Birthday Cake"
-	desc = "Happy Birthday little clown..."
+	desc = "Happy Birthday..."
 	icon_state = "birthdaycake"
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
 	slices_num = 5

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -426,7 +426,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/banana
 	seed = "/obj/item/seeds/bananaseed"
 	name = "banana"
-	desc = "It's an excellent prop for a clown."
+	desc = "It's an excellent prop for a comedy."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "banana"
 	item_state = "banana"