Merge branch 'master' into development

code/game/objects/items/glassjar.dm

@@ -71,7 +71,7 @@
 		if(contains != 1)
 			return
 		var/obj/item/weapon/spacecash/S = W
-		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].</span>")
+		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? "credits" : "credit"] into \the [src].</span>")
 		user.drop_from_inventory(S)
 		S.loc = src
 		update_icon()

code/game/objects/items/weapons/melee/energy.dm

@@ -60,7 +60,7 @@
 	name = "energy glaive"
 	desc = "An energized glaive."
 	icon_state = "eglaive0"
-	active_force = 60
+	active_force = 40
 	active_throwforce = 60
 	active_w_class = 5
 	force = 20

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

@@ -18,13 +18,19 @@ var/global/list/cached_icons = list()
 	flags = OPENCONTAINER
 	var/paint_type = "red"
 
+	attack(mob/M as mob, mob/user as mob, def_zone)
+		if(istype(M, /mob/living/))
+			user.visible_message("<span class='warning'>\The [M] has been splashed with something by [user] to no effect!</span>")
+			reagents.trans_to_turf(M.loc, 5)
+			return
+
 	afterattack(turf/simulated/target, mob/user, proximity)
-		if(!proximity) return
+		if(!proximity)
+			return
 		if(istype(target) && reagents.total_volume > 5)
 			user.visible_message("<span class='warning'>\The [target] has been splashed with something by [user]!</span>")
 			reagents.trans_to_turf(target, 5)
-		else
-			return ..()
+		return
 
 	New()
 		if(paint_type && lentext(paint_type) > 0)

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

@@ -32,11 +32,6 @@
 
 /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod.
 
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
-
-	msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return
@@ -47,7 +42,7 @@
 		user.Paralyse(20)
 		return
 
-	if (M.stat !=2 && ishuman(M))
+	if (M.stat !=2 && ishuman(M) && user.a_intent != I_HURT)
 		var/mob/living/K = M
 		if(cult && (K.mind in cult.current_antagonists) && prob(33))
 			if(do_after(user, 15))
@@ -55,7 +50,7 @@
 				var/choice = alert(K,"Do you want to give up your goal?","Become cleansed","Resist","Give in")
 				switch(choice)
 					if("Resist")
-						K.visible_message("\red The gaze in [K]'s eyes remains determined.", "\blue You turn away from the light, remaining true to your dark lord. The light burns you due to rejection!")
+						K.visible_message("\red The gaze in [K]'s eyes remains determined.", "\blue You turn away from the light, remaining true to your dark lord. <b>Anathema!</b>")
 						K.say("*scream")
 						K.take_overall_damage(5, 15)
 					if("Give in")
@@ -72,6 +67,13 @@
 			user << "<span class='danger'>The rod appears to do nothing.</span>"
 			M.visible_message("<span class='danger'>\The [user] waves \the [src] over \the [M]'s head.</span>")
 			return
+		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Is being deconverted with the [src.name] by [user.name] ([user.ckey])</font>")
+		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attempt to deconvert [M.name] ([M.ckey])</font>")
+
+		msg_admin_attack("[key_name(user)] attempted to deconvert [key_name(M)] with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+
+	else
+		return ..()
 
 /obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity)

code/game/objects/structures/crates_lockers/crates.dm

@@ -73,6 +73,13 @@
 			return
 		if(W.loc != user) // This should stop mounted modules ending up outside the module.
 			return
+		if(W.abstract) //Prevents 'abstract' items (such as grabs) from creeping into the material realm.
+			if(istype(W, /obj/item/weapon/grab))
+				var/obj/item/weapon/grab/G = W
+				user << "<span class='notice'>[G.affecting] just doesn't fit!</span>"
+			else
+				user << "<span class='notice'>[W] does not belong there!</span>"
+			return
 		user.drop_item()
 		if(W)
 			W.forceMove(src.loc)