fixed conflict

code/__DEFINES/misc.dm

@@ -287,3 +287,6 @@
 #define SHELTER_DEPLOY_BAD_TURFS "bad turfs"
 #define SHELTER_DEPLOY_BAD_AREA "bad area"
 #define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects"
+
+// The cooldown on OOC messages such as OOC, LOOC, praying and adminhelps
+#define OOC_COOLDOWN 5

code/game/atoms_movable.dm

@@ -179,7 +179,7 @@
 	if(has_gravity(src))
 		return 1
 
-	if(pulledby)
+	if(pulledby && !pulledby.pulling)
 		return 1
 
 	if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier

code/game/machinery/newscaster.dm

@@ -981,7 +981,7 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa
 /obj/machinery/newscaster/proc/newsAlert(var/news_call)   //This isn't Agouri's work, for it is ugly and vile.
 	if(news_call)
 
-		atom_say("Breaking news from [news_call]!")
+		atom_say("[news_call]!")
 		src.alert = 1
 		src.update_icon()
 		spawn(300)

code/game/objects/items/weapons/dice.dm

@@ -147,6 +147,7 @@
 		triggered = 1
 		visible_message("<span class='notice'>You hear a quiet click.</span>")
 		spawn(40)
+
 			var/cap = 0
 			if(result > MAX_EX_LIGHT_RANGE && result != 20)
 				cap = 1
@@ -156,6 +157,13 @@
 			var/turf/epicenter = get_turf(src)
 			explosion(epicenter, round(result*0.25), round(result*0.5), round(result), round(result*1.5), 1, cap)
 
+			var/turf/bombturf = get_turf(src)
+			var/area/A = get_area(bombturf)
+			bombers += "E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]"
+			message_admins("E20 detonated at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a> with a roll of [result]. Triggered by: [key_name_admin(user)]")
+			log_game("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]")
+
+
 /obj/item/weapon/dice/update_icon()
 	overlays.Cut()
 	overlays += "[src.icon_state][src.result]"

code/game/verbs/ooc.dm

@@ -32,7 +32,7 @@ var/global/admin_ooc_colour = "#b82e00"
 		if(prefs.muted & MUTE_OOC)
 			to_chat(src, "<span class='danger'>You cannot use OOC (muted).</span>")
 			return
-		if(handle_spam_prevention(msg, MUTE_OOC))
+		if(handle_spam_prevention(msg, MUTE_OOC, OOC_COOLDOWN))
 			return
 		if(findtext(msg, "byond://"))
 			to_chat(src, "<B>Advertising other servers is not allowed.</B>")
@@ -168,7 +168,7 @@ var/global/admin_ooc_colour = "#b82e00"
 		if(prefs.muted & MUTE_OOC)
 			to_chat(src, "<span class='danger'>You cannot use LOOC (muted).</span>")
 			return
-		if(handle_spam_prevention(msg,MUTE_OOC))
+		if(handle_spam_prevention(msg, MUTE_OOC, OOC_COOLDOWN))
 			return
 		if(findtext(msg, "byond://"))
 			to_chat(src, "<B>Advertising other servers is not allowed.</B>")

code/modules/admin/verbs/adminhelp.dm

@@ -24,7 +24,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(!msg)
 		return
 
-	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+	if(handle_spam_prevention(msg, MUTE_ADMINHELP, OOC_COOLDOWN))
 		return
 
 	msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))

code/modules/admin/verbs/adminpm.dm

@@ -99,7 +99,7 @@
 				adminhelp(msg)	//admin we are replying to has vanished, adminhelp instead
 			return
 
-	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+	if(handle_spam_prevention(msg, MUTE_ADMINHELP, OOC_COOLDOWN))
 		return
 
 	//clean the message if it's not sent by a high-rank admin

code/modules/admin/verbs/pray.dm

@@ -9,7 +9,7 @@
 		if(usr.client.prefs.muted & MUTE_PRAY)
 			to_chat(usr, "\red You cannot pray (muted).")
 			return
-		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
+		if(client.handle_spam_prevention(msg, MUTE_PRAY, OOC_COOLDOWN))
 			return
 
 	var/image/cross = image('icons/obj/storage.dmi',"bible")

code/modules/client/client defines.dm

@@ -4,8 +4,9 @@
 		////////////////
 	var/datum/admins/holder = null
 
-	var/last_message	= "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
-	var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
+	var/last_message	= "" //contains the last message sent by this client - used to protect against copy-paste spamming.
+	var/last_message_count = 0 //contains a number of how many times a message identical to last_message was sent.
+	var/last_message_time = 0 //holds the last time (based on world.time) a message was sent
 
 		/////////
 		//OTHER//

code/modules/client/client procs.dm

@@ -233,19 +233,25 @@
 		return 0
 	return 1
 
-/client/proc/handle_spam_prevention(var/message, var/mute_type)
-	if(config.automute_on && !holder && src.last_message == message)
-		src.last_message_count++
-		if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
-			to_chat(src, "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied.")
-			cmd_admin_mute(src.mob, mute_type, 1)
+/client/proc/handle_spam_prevention(var/message, var/mute_type, var/throttle = 0)
+	if(throttle)
+		if((last_message_time + throttle > world.time) && !check_rights(R_ADMIN, 0))
+			var/wait_time = round(((last_message_time + throttle) - world.time) / 10, 1)
+			to_chat(src, "<span class='danger'>You are sending messages to quickly. Please wait [wait_time] [wait_time == 1 ? "second" : "seconds"] before sending another message.</span>")
+			return 1		
+		last_message_time = world.time
+	if(config.automute_on && !check_rights(R_ADMIN, 0) && last_message == message)
+		last_message_count++
+		if(last_message_count >= SPAM_TRIGGER_AUTOMUTE)
+			to_chat(src, "<span class='danger'>You have exceeded the spam filter limit for identical messages. An auto-mute was applied.</span>")
+			cmd_admin_mute(mob, mute_type, 1)
 			return 1
-		if(src.last_message_count >= SPAM_TRIGGER_WARNING)
-			to_chat(src, "\red You are nearing the spam filter limit for identical messages.")
+		if(last_message_count >= SPAM_TRIGGER_WARNING)
+			to_chat(src, "<span class='danger'>You are nearing the spam filter limit for identical messages.</span>")
 			return 0
 	else
 		last_message = message
-		src.last_message_count = 0
+		last_message_count = 0
 		return 0
 
 //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.

code/modules/projectiles/guns/projectile/saw.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/automatic/l6_saw
 	name = "\improper L6 SAW"
-	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
+	desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
 	icon_state = "l6closed100"
 	item_state = "l6closedmag"
 	w_class = 5

code/modules/recycling/conveyor2.dm

@@ -300,7 +300,7 @@
 /obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
 	return {"
  	<ul>
- 	<li><b>One direction only:</b> <a href='?src=\ref[src];toggle_logic=1'>[convdir ? "On" : "Off"]</a></li>
+ 	<li><b>One direction only:</b> <a href='?src=[UID()];toggle_logic=1'>[convdir ? "On" : "Off"]</a></li>
  	</ul>"}