cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11844 from Heroman3003/weaverfixes

Browse Source 
Fixes bugs related to weaversilk structures
This commit is contained in:
Novacat
2021-11-17 09:04:34 -05:00
committed by Chompstation Bot
parent e6f330182b
commit a56e29ab3b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/ai/ai_holder_combat.dm
View File

@@ -292,15 +292,20 @@
// Kill common obstacle in the way like tables. // Kill common obstacle in the way like tables.
var/obj/structure/obstacle = locate(/obj/structure, problem_turf) 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) || istype(obstacle, /obj/effect/weaversilk/wall)) //VOREStation Edit: spdr if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
ai_log("destroy_surroundings() : Attacking generic structure.", AI_LOG_INFO) ai_log("destroy_surroundings() : Attacking generic structure.", AI_LOG_INFO)
return melee_attack(obstacle) return melee_attack(obstacle)
var/obj/effect/weaversilk/web = locate(/obj/effect/weaversilk, problem_turf)
if(istype(web, /obj/effect/weaversilk/wall)) //VOREStation Edit: spdr
ai_log("destroy_surroundings() : Attacking weaversilk effect.", AI_LOG_INFO)
return melee_attack(web)
for(var/obj/machinery/door/D in problem_turf) // Required since firelocks take up the same turf. for(var/obj/machinery/door/D in problem_turf) // Required since firelocks take up the same turf.
if(D.density) if(D.density)
ai_log("destroy_surroundings() : Attacking closed door.", AI_LOG_INFO) ai_log("destroy_surroundings() : Attacking closed door.", AI_LOG_INFO)
return melee_attack(D) return melee_attack(D)
// Should always be last thing attempted // Should always be last thing attempted
if(!problem_turf.opacity) if(!problem_turf.opacity)
ai_log("destroy_surroundings() : Attacking a transparent (window?) turf.", AI_LOG_INFO) ai_log("destroy_surroundings() : Attacking a transparent (window?) turf.", AI_LOG_INFO)

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

@@ -89,6 +89,7 @@
desc = "A silky, yet firm trap. Be careful not to step into it! Or don't..." desc = "A silky, yet firm trap. Be careful not to step into it! Or don't..."
icon_state = "trap" icon_state = "trap"
var/trap_active = TRUE var/trap_active = TRUE
can_buckle = TRUE
/obj/effect/weaversilk/trap/Crossed(atom/movable/AM as mob|obj) /obj/effect/weaversilk/trap/Crossed(atom/movable/AM as mob|obj)
if(AM.is_incorporeal()) if(AM.is_incorporeal())
@@ -106,17 +107,18 @@
"<b>You hear a squishy noise!</b>" "<b>You hear a squishy noise!</b>"
) )
set_dir(L.dir) set_dir(L.dir)
can_buckle = TRUE
buckle_mob(L) buckle_mob(L)
L.Stun(1) L.Stun(1)
to_chat(L, "<span class='danger'>The sticky fibers of \the [src] ensnare, trapping you in place!</span>") to_chat(L, "<span class='danger'>The sticky fibers of \the [src] ensnare, trapping you in place!</span>")
trap_active = FALSE trap_active = FALSE
can_buckle = initial(can_buckle)
desc += " Actually, it looks like it's been all spent." desc += " Actually, it looks like it's been all spent."
..() ..()
/obj/effect/weaversilk/trap/MouseDrop_T(atom/movable/AM,mob/user)
return
// Items // Items
// TODO: Spidersilk clothing and actual bindings, once sprites are ready. // TODO: Spidersilk clothing and actual bindings, once sprites are ready.