Merge pull request #10035 from Heroman3003/weak-ass-webs

Makes weaversilk webs die from everything, not just fists + stun timer fix

code/modules/ai/ai_holder_combat.dm

@@ -9,7 +9,7 @@
 	var/violent_breakthrough = TRUE			// If false, the AI is not allowed to destroy things like windows or other structures in the way. Requires above var to be true.
 
 	var/stand_ground = FALSE				// If true, the AI won't try to get closer to an enemy if out of range.
-	
+
 // This does the actual attacking.
 /datum/ai_holder/proc/engage_target()
 	ai_log("engage_target() : Entering.", AI_LOG_DEBUG)
@@ -293,7 +293,7 @@
 
 		// Kill common obstacle in the way like tables.
 		var/obj/structure/obstacle = locate(/obj/structure, problem_turf)
-		if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+		if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille) || istype(obstacle, /obj/effect/weaversilk/wall))	//VOREStation Edit: spdr
 			ai_log("destroy_surroundings() : Attacking generic structure.", AI_LOG_INFO)
 			return melee_attack(obstacle)
 

code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm

@@ -7,6 +7,29 @@
 	anchored = 1
 	density = 0
 
+/obj/effect/weaversilk/ex_act(severity)
+	qdel(src)
+	return
+
+/obj/effect/weaversilk/attackby(var/obj/item/weapon/W, var/mob/user)
+	user.setClickCooldown(user.get_attack_speed(W))
+
+	if(W.force)
+		visible_message("<span class='warning'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
+		qdel(src)
+
+/obj/effect/weaversilk/bullet_act(var/obj/item/projectile/Proj)
+	..()
+	if(Proj.get_structure_damage())
+		qdel(src)
+
+/obj/effect/weaversilk/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	qdel(src)
+
+/obj/effect/weaversilk/attack_generic(mob/user as mob, var/damage)
+	if(damage)
+		qdel(src)
+
 /obj/effect/weaversilk/attack_hand(mob/user as mob)
 	..()
 	if(user.a_intent == I_HURT)
@@ -82,11 +105,11 @@
 				"<b>You hear a squishy noise!</b>"
 				)
 			set_dir(L.dir)
-			can_buckle = 1
+			can_buckle = TRUE
 			buckle_mob(L)
-			L.Stun(1 SECOND)
+			L.Stun(1)
 			to_chat(L, "<span class='danger'>The sticky fibers of \the [src] ensnare, trapping you in place!</span>")
-			trap_active = 0
+			trap_active = FALSE
 			can_buckle = initial(can_buckle)
 			desc += " Actually, it looks like it's been all spent."
 	..()

vorestation.dme

@@ -2662,6 +2662,7 @@
 #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\station_vr.dm"
+#include "code\modules\mob\living\carbon\human\species\station\teshari.dm"
 #include "code\modules\mob\living\carbon\human\species\station\xenochimera_hud_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\xenochimera_trait_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_blob.dm"
@@ -2673,7 +2674,6 @@
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm"
-#include "code\modules\mob\living\carbon\human\species\station\teshari.dm"
 #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm"
 #include "code\modules\mob\living\carbon\human\species\virtual_reality\opaque_form.dm"
 #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm"