More funshit

code/game/objects/items.dm

@@ -469,22 +469,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 			usr.FlushCurrentAction()
 			return TRUE //returning TRUE as a "is this overridden?" flag
 	if(isrevenant(usr))
-		var/mob/living/simple_animal/revenant/spooker = usr
-		if(!anchored && !spooker.telekinesis_cooldown)
-			spooker.change_essence_amount(-5, FALSE, "telekinesis")
-			spooker.stun(10)
-			spooker.reveal(30)
-			spooker.telekinesis_cooldown = TRUE
-			float(TRUE, 1)
-			sleep(10)
-			safe_throw_at(over, 10, 2)
-			ADD_TRAIT(src, TRAIT_SPOOKY_THROW)
-			DoRevenantThrowEffects(over)
-			log_combat(usr, over, "spooky telekinesised at", src)
-			var/obj/effect/temp_visual/telekinesis/T = new(get_turf(src))
-			T.color = purple
-			addtimer(CALLBACK(src, /atom/movable.proc/float, FALSE), 2)
-			addtimer(CALLBACK(spooker, /mob/living/simple_animal/revenant.proc/telekinesis_cooldown_end), 50)
+		if(RevenantThrow(over, usr, src))
 			return
 
 	if(!Adjacent(usr) || !over.Adjacent(usr))
@@ -493,12 +478,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	over.MouseDrop_T(src,usr)
 	return
 
-//Use this for effects you want to happen when a revenant throws itself, check the TRAIT_SPOOKY_THROW if you want to know if its still being thrown
-/obj/item/proc/DoRevenantThrowEffects(atom/target)
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	if(STR)
-
-
 // called after an item is placed in an equipment slot
 // user is mob that equipped it
 // slot uses the slot_X defines found in setup.dm

code/game/objects/items/cigs_lighters.dm

@@ -137,7 +137,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	. = ..()
 
 /obj/item/clothing/mask/cigarette/DoRevenantThrowEffects(atom/target)
-	attackby(src)
+	if(lit)
+		attackby()
+	else
+		light()
 
 /obj/item/clothing/mask/cigarette/attackby(obj/item/W, mob/user, params)
 	if(!lit && smoketime > 0)
@@ -520,6 +523,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		overlay_state = pick(overlay_list)
 	update_icon()
 
+/obj/item/lighter/DoRevenantThrowEffects(atom/target)
+	set_lit()
+
 /obj/item/lighter/suicide_act(mob/living/carbon/user)
 	if (lit)
 		user.visible_message("<span class='suicide'>[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/game/objects/items/devices/flashlight.dm

@@ -37,11 +37,14 @@
 /obj/item/flashlight/attack_self(mob/user)
 	on = !on
 	update_brightness(user)
-	playsound(user, on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, 1)
+	playsound(src, on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
-	return 1
+	return TRUE
+
+/obj/item/flashlight/DoRevenantThrowEffects(atom/target)
+	attack_self()
 
 /obj/item/flashlight/suicide_act(mob/living/carbon/human/user)
 	if (user.eye_blind)

code/game/objects/items/plushes.dm

@@ -46,7 +46,7 @@
 	set_snowflake_from_config(id)
 
 /obj/item/toy/plush/DoRevenantThrowEffects(atom/target)
-	var/datum/component/squeak/squeaker = GetComponent(datum/component/squeak)
+	var/datum/component/squeak/squeaker = GetComponent(/datum/component/squeak)
 	squeaker.do_play_squeak(TRUE)
 
 /obj/item/toy/plush/Initialize(mapload, set_snowflake_id)

code/game/objects/items/pneumaticCannon.dm

@@ -44,12 +44,11 @@
 	START_PROCESSING(SSobj, src)
 
 /obj/item/pneumatic_cannon/DoRevenantThrowEffects(atom/target)
-	var/target
+	var/picked_target
 	var/list/possible_targets = range(3,src)
-	target = pick(possible_targets)
+	picked_target = pick(possible_targets)
 	if(target)
-		discharge = TRUE
-		Fire(null, target)
+		Fire(null, picked_target)
 
 /obj/item/pneumatic_cannon/process()
 	if(++charge_tick >= charge_ticks && charge_type)
@@ -148,7 +147,7 @@
 		if(!isliving(user))
 			return
 	var/discharge = 0
-	if(!can_trigger_gun(user))
+	if(user && !can_trigger_gun(user))
 		return
 	if(!loadedItems || !loadedWeightClass)
 		if(user)
@@ -174,14 +173,13 @@
 			var/list/possible_targets = range(3,src)
 			target = pick(possible_targets)
 		discharge = TRUE
-	if(!discharge)
+	if(!discharge && user)
 		user.visible_message("<span class='danger'>[user] fires \the [src]!</span>", \
 				    		 "<span class='danger'>You fire \the [src]!</span>")
-	if(user)
-		log_combat(user, target, "fired at", src)
 	var/turf/T = get_target(target, get_turf(src))
 	playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE)
 	if(user)
+		log_combat(user, target, "fired at", src)
 		fire_items(T, user)
 	else
 		fire_items(T)

code/game/objects/items/tools/weldingtool.dm

@@ -57,6 +57,9 @@
 	else
 		item_state = "[initial(item_state)]"
 
+/obj/item/weldingtool/DoRevenantThrowEffects(atom/target)
+	attack_self()
+
 /obj/item/weldingtool/update_overlays()
 	. = ..()
 	if(change_icons)
@@ -208,12 +211,14 @@
 //Switches the welder on
 /obj/item/weldingtool/proc/switched_on(mob/user)
 	if(!status)
-		to_chat(user, "<span class='warning'>[src] can't be turned on while unsecured!</span>")
+		if(user)
+			to_chat(user, "<span class='warning'>[src] can't be turned on while unsecured!</span>")
 		return
 	welding = !welding
 	if(welding)
 		if(get_fuel() >= 1)
-			to_chat(user, "<span class='notice'>You switch [src] on.</span>")
+			if(user)
+				to_chat(user, "<span class='notice'>You switch [src] on.</span>")
 			playsound(loc, acti_sound, 50, 1)
 			force = 15
 			damtype = "fire"