for-the-strength-from-which-he-gives-is-unerring

code/game/objects/structures/barsign.dm

@@ -74,9 +74,6 @@
 
 
 /obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user)
-	if(!allowed(user))
-		to_chat(user, "<span class = 'info'>Access denied.</span>")
-		return
 	if( istype(I, /obj/item/screwdriver))
 		if(!panel_open)
 			to_chat(user, "<span class='notice'>You open the maintenance panel.</span>")
@@ -106,6 +103,8 @@
 			broken = 0
 		else
 			to_chat(user, "<span class='warning'>You need at least two lengths of cable!</span>")
+	else
+		return ..()
 
 
 

code/game/objects/structures/coathanger.dm

@@ -25,7 +25,6 @@
 		coat.loc = src
 		update_icon()
 	else
-		to_chat(user, "<span class='notice'>You cannot hang [W] on [src]</span>")
 		return ..()
 
 /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0)

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

@@ -213,6 +213,7 @@
 		else
 			to_chat(user, "<span class='warning'>Out of charges.</span>")
 			return
+		return
 
 	if(opened)
 		if(istype(W, /obj/item/grab))
@@ -258,8 +259,10 @@
 		update_icon()
 		for(var/mob/M in viewers(src))
 			M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 3, "You hear welding.", 2)
-	else
+	else if(user.a_intent != INTENT_HARM)
 		attack_hand(user)
+	else
+		return ..()
 
 /obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user)
 	..()

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -86,4 +86,4 @@
 	else if((istype(W, /obj/item/card/emag) || istype(W, /obj/item/melee/energy/blade)) && !broken)
 		emag_act(user)
 	else
-		to_chat(user, "<span class='warning'>Access Denied</span>")
+		return ..()

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -86,9 +86,11 @@
 	else if((istype(W, /obj/item/card/emag)||istype(W, /obj/item/melee/energy/blade)) && !broken)
 		emag_act(user)
 	else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weldingtool))
-		return ..(W,user)
-	else
+		return ..(W, user)
+	else if(user.a_intent != INTENT_HARM)
 		togglelock(user)
+	else
+		return ..()
 
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)

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

@@ -176,7 +176,10 @@
 			playsound(loc, W.usesound, 100, 1)
 			rigged = FALSE
 			return
-	else return attack_hand(user)
+	else if(user.a_intent != INTENT_HARM)
+		attack_hand(user)
+	else
+		return ..()
 
 /obj/structure/closet/singularity_act()
 	dump_contents()
@@ -464,7 +467,7 @@
 						 								"<span class='notice'>You have secured [src]'s floor casters.</span>")
 				anchored = TRUE
 	else
-		..()
+		return ..()
 
 /obj/structure/closet/crate/radiation
 	desc = "A crate with a radiation sign on it."

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

@@ -45,8 +45,10 @@
 							 "<span class='notice'>You pry open \the [src].</span>", \
 							 "<span class='notice'>You hear splitting wood.</span>")
 		qdel(src)
+	else if(user.a_intent != INTENT_HARM)
+		attack_hand(user)
 	else
-		return attack_hand(user)
+		return ..()
 
 /obj/structure/largecrate/mule
 
@@ -56,7 +58,7 @@
 /obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob)	//ugly but oh well
 	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc)
-	..()
+	return ..()
 
 /obj/structure/largecrate/cow
 	name = "cow crate"
@@ -65,7 +67,7 @@
 /obj/structure/largecrate/cow/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/cow(loc)
-	..()
+	return ..()
 
 /obj/structure/largecrate/goat
 	name = "goat crate"
@@ -74,7 +76,7 @@
 /obj/structure/largecrate/goat/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
-	..()
+	return ..()
 
 /obj/structure/largecrate/chick
 	name = "chicken crate"
@@ -85,7 +87,7 @@
 		var/num = rand(4, 6)
 		for(var/i = 0, i < num, i++)
 			new /mob/living/simple_animal/chick(loc)
-	..()
+	return ..()
 
 /obj/structure/largecrate/cat
 	name = "cat crate"
@@ -94,4 +96,4 @@
 /obj/structure/largecrate/cat/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/crowbar))
 		new /mob/living/simple_animal/pet/cat(loc)
-	..()
+	return ..()

code/game/objects/structures/curtains.dm

@@ -68,7 +68,7 @@
 				to_chat(user, "<span class='notice'>You cut apart [src].</span>")
 				deconstruct()
 	else
-		. = ..()
+		return ..()
 
 /obj/structure/curtain/deconstruct(disassembled = TRUE)
 	new /obj/item/stack/sheet/cloth(loc, 2)

code/game/objects/structures/electricchair.dm

@@ -31,6 +31,7 @@
 		part = null
 		qdel(src)
 		return
+	return ..()
 
 /obj/structure/chair/e_chair/verb/activate_e_chair()
 	set name = "Activate Electric Chair"

code/game/objects/structures/extinguisher.dm

@@ -76,6 +76,7 @@
 		else
 			playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
 			opened = !opened
+		update_icon()
 	else if(istype(O, /obj/item/weldingtool))
 		if(has_extinguisher)
 			to_chat(user, "<span class='warning'>You need to remove the extinguisher before deconstructing the cabinet!</span>")
@@ -95,10 +96,13 @@
 							"<span class='notice'>You cut [src] apart with [WT].</span>",
 							"<span class='italics'>You hear welding.</span>")
 			deconstruct(TRUE)
-	else
+	else if(user.a_intent != INTENT_HARM)
 		playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
 		opened = !opened
-	update_icon()
+		update_icon()
+	else
+		return ..()
+
 
 /obj/structure/extinguisher_cabinet/attack_hand(mob/user)
 	if(isrobot(user) || isalien(user))

code/game/objects/structures/fluff.dm

@@ -20,7 +20,7 @@
 			new/obj/item/stack/sheet/metal(drop_location())
 			qdel(src)
 		return
-	..()
+	return ..()
 
 /obj/structure/fluff/empty_terrarium //Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated.
 	name = "empty terrarium"

code/game/objects/structures/girders.dm

@@ -451,6 +451,8 @@
 			var/turf/T = get_turf(src)
 			T.ChangeTurf(/turf/simulated/wall/cult)
 			qdel(src)
+	else
+		return ..()
 
 /obj/structure/girder/cult/narsie_act()
 	return

code/game/objects/structures/kitchen_spike.dm

@@ -27,6 +27,9 @@
 			new /obj/structure/kitchenspike(loc)
 			add_fingerprint(user)
 			qdel(src)
+		return
+	else
+		return ..()
 
 
 /obj/structure/kitchenspike
@@ -62,16 +65,15 @@
 		return
 	if(has_buckled_mobs())
 		to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
-	else
-		if(isliving(G.affecting))
-			if(!has_buckled_mobs())
-				if(do_mob(user, src, 120))
-					if(spike(G.affecting))
-						G.affecting.visible_message("<span class='danger'>[user] slams [G.affecting] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
-						qdel(G)
-						return
-		to_chat(user, "<span class='danger'>You can't use that on the spike!</span>")
 		return
+	if(isliving(G.affecting))
+		if(!has_buckled_mobs())
+			if(do_mob(user, src, 120))
+				if(spike(G.affecting))
+					G.affecting.visible_message("<span class='danger'>[user] slams [G.affecting] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
+					qdel(G)
+		return
+	return ..()
 
 /obj/structure/kitchenspike/proc/spike(mob/living/victim)
 

code/game/objects/structures/misc.dm

@@ -11,9 +11,6 @@
 	anchored = 1
 	density = 1
 
-	attackby(obj/item/W as obj, mob/user as mob, params)
-		return attack_hand(user)
-
 	attack_hand(mob/user as mob)
 		to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
 
@@ -26,11 +23,6 @@
 	anchored = 1
 	density = 0
 
-	attackby(obj/item/W as obj, mob/user as mob, params)
-
-		return attack_hand(user)
-
-
 	attack_hand(mob/user as mob)
 
 

code/game/objects/structures/mop_bucket.dm

@@ -32,4 +32,6 @@
 			to_chat(user, "<span class='notice'>You wet the mop</span>")
 			playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1)
 		if(src.reagents.total_volume < 1)
-			to_chat(user, "<span class='notice'>Out of water!</span>")
+			to_chat(user, "<span class='notice'>Out of water!</span>")
+		return
+	return ..()

code/game/objects/structures/morgue.dm

@@ -133,8 +133,9 @@
 		else
 			name = "Morgue"
 			overlays.Cut()
-	add_fingerprint(user)
-	return
+		add_fingerprint(user)
+		return
+	return ..()
 
 /obj/structure/morgue/relaymove(mob/user as mob)
 	if(user.stat)
@@ -325,8 +326,9 @@
 			name = text("Crematorium- '[]'", t)
 		else
 			name = "Crematorium"
-	add_fingerprint(user)
-	return
+		add_fingerprint(user)
+		return
+	return ..()
 
 /obj/structure/crematorium/relaymove(mob/user as mob)
 	if(user.stat || locked)

code/game/objects/structures/noticeboard.dm

@@ -30,6 +30,8 @@
 			to_chat(user, "<span class='notice'>You pin the paper to the noticeboard.</span>")
 		else
 			to_chat(user, "<span class='notice'>You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.</span>")
+		return
+	return ..()
 
 /obj/structure/noticeboard/attack_hand(user as mob)
 	var/dat = "<B>Noticeboard</B><BR>"

code/game/objects/structures/plasticflaps.dm

@@ -53,7 +53,7 @@
 				P.add_fingerprint(user)
 				qdel(src)
 	else
-		. = ..()
+		return ..()
 
 /obj/structure/plasticflaps/CanPass(atom/A, turf/T)
 	if(istype(A) && A.checkpass(PASSGLASS))

code/game/objects/structures/reflector.dm

@@ -46,6 +46,7 @@
 			to_chat(user, "You dismantle [src].")
 			new /obj/item/stack/sheet/metal(src.loc, 5)
 			qdel(src)
+		return
 	if(istype(W, /obj/item/weldingtool))
 		var/obj/item/weldingtool/WT = W
 		if(!anchored)
@@ -70,6 +71,7 @@
 						return
 					anchored  = 0
 					to_chat(user, "<span class='notice'>You cut [src] free from the floor.</span>")
+		return
 	//Finishing the frame
 	if(istype(W,/obj/item/stack/sheet))
 		if(finished)
@@ -96,6 +98,8 @@
 				S.use(1)
 				new /obj/structure/reflector/box (src.loc)
 				qdel(src)
+		return
+	return ..()
 
 /obj/structure/reflector/proc/get_reflection(srcdir,pdir)
 	return 0

code/game/objects/structures/signs.dm

@@ -28,7 +28,8 @@
 		//S.icon = I.Scale(24, 24)
 		S.sign_state = icon_state
 		qdel(src)
-	else ..()
+	else
+		return ..()
 
 /obj/item/sign
 	name = "sign"
@@ -62,7 +63,8 @@
 		S.icon_state = sign_state
 		to_chat(user, "You fasten \the [S] with your [tool].")
 		qdel(src)
-	else ..()
+	else
+		return ..()
 
 /obj/structure/sign/double/map
 	name = "station map"

code/game/objects/structures/statues.dm

@@ -80,7 +80,7 @@
 
 /obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params)
 	radiate()
-	..()
+	return ..()
 
 /obj/structure/statue/uranium/Bumped(atom/user)
 	radiate()
@@ -137,7 +137,7 @@
 		investigate_log("[key_name(user)] ignited a plasma statue at [COORD(loc)]", "atmos")
 		ignite(is_hot(W))
 		return
-	..()
+	return ..()
 
 /obj/structure/statue/plasma/proc/PlasmaBurn()
 	atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 160)
@@ -230,7 +230,7 @@
 
 /obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params)
 	honk()
-	..()
+	return ..()
 
 /obj/structure/statue/bananium/attack_hand(mob/user)
 	honk()

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -78,6 +78,8 @@
 			user.visible_message("<span class='notice'>[user] collapses \the [name].</span>", "<span class='notice'>You collapse \the [name].</span>")
 			new/obj/item/roller(get_turf(src))
 			qdel(src)
+	else
+		return ..()
 
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M)
 	density = TRUE

code/game/objects/structures/tables_racks.dm

@@ -542,7 +542,7 @@
 					to_chat(user, "<span class='notice'>You weaken the table.</span>")
 					deconstruction_ready = TRUE
 	else
-		. = ..()
+		return ..()
 
 /obj/structure/table/reinforced/brass
 	name = "brass table"
@@ -753,7 +753,7 @@
 		new /obj/item/stack/sheet/metal(user.loc)
 		qdel(src)
 	else
-		. = ..()
+		return ..()
 
 /obj/item/rack_parts/attack_self(mob/user)
 	if(building)

code/game/objects/structures/tank_dispenser.dm

@@ -63,6 +63,7 @@
 		else
 			to_chat(user, "<span class='notice'>[src] is full.</span>")
 		SSnanoui.update_uis(src)
+		return
 	if(istype(I, /obj/item/tank/plasma))
 		if(plasmatanks < 10)
 			user.drop_item()
@@ -74,6 +75,7 @@
 		else
 			to_chat(user, "<span class='notice'>[src] is full.</span>")
 		SSnanoui.update_uis(src)
+		return
 	if(istype(I, /obj/item/wrench))
 		if(anchored)
 			to_chat(user, "<span class='notice'>You lean down and unwrench [src].</span>")
@@ -81,6 +83,8 @@
 		else
 			to_chat(user, "<span class='notice'>You wrench [src] into place.</span>")
 			anchored = 1
+		return
+	return ..()
 
 /obj/structure/dispenser/Topic(href, href_list)
 	if(..())

code/game/objects/structures/target_stake.dm

@@ -24,10 +24,7 @@
 
 /obj/structure/target_stake/attackby(obj/item/W, mob/user, params)
 	// Putting objects on the stake. Most importantly, targets
-	if(pinned_target)
-		return // get rid of that pinned target first!
-
-	if(istype(W, /obj/item/target))
+	if(istype(W, /obj/item/target) && !pinned_target)
 		density = 0
 		W.density = 1
 		user.drop_item(src)
@@ -35,6 +32,8 @@
 		W.layer = 3.1
 		pinned_target = W
 		to_chat(user, "You slide the target into the stake.")
+		return
+	return ..()
 
 /obj/structure/target_stake/attack_hand(mob/user)
 	// taking pinned targets off!