From 0f16f866eb789a901d1cddd1f9c6b943903594ca Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:43:41 -0700
Subject: [PATCH 1/3] Update arachnid.dm
---
code/modules/mob/living/carbon/human/species_types/arachnid.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 4a8c872400..46f30dd863 100644
--- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -139,6 +139,9 @@
if(E.web_ready == FALSE)
to_chat(H, "You need to wait awhile to regenerate web fluid.")
return
+ if(!isliving(A) && A.anchored)
+ to_chat(H, "[A] is bolted to the floor!")
+ return
if(!do_after(H, 10 SECONDS, 1, A))
to_chat(H, "Your web spinning was interrupted!")
return
From 11722f6f5ec67a627e3d9389c8f0028d599946a7 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:47:53 -0700
Subject: [PATCH 2/3] Update arachnid.dm
---
code/modules/mob/living/carbon/human/species_types/arachnid.dm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 46f30dd863..68d2cbbff6 100644
--- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -142,6 +142,9 @@
if(!isliving(A) && A.anchored)
to_chat(H, "[A] is bolted to the floor!")
return
+ if(istype(A, /obj/structure/arachnid))
+ to_chat(H, "No double wrapping.")
+ return
if(!do_after(H, 10 SECONDS, 1, A))
to_chat(H, "Your web spinning was interrupted!")
return
From f9f328a9ea3bbf04c58df3ab898d7086127c34b3 Mon Sep 17 00:00:00 2001
From: DeltaFire
Date: Wed, 23 Dec 2020 20:12:06 +0100
Subject: [PATCH 3/3] we love this code
---
.../mob/living/carbon/human/species_types/arachnid.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 68d2cbbff6..a44177ced1 100644
--- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -139,12 +139,18 @@
if(E.web_ready == FALSE)
to_chat(H, "You need to wait awhile to regenerate web fluid.")
return
+ if(!H.Adjacent(A)) //No.
+ return
if(!isliving(A) && A.anchored)
to_chat(H, "[A] is bolted to the floor!")
return
if(istype(A, /obj/structure/arachnid))
to_chat(H, "No double wrapping.")
return
+ if(istype(A, /obj/effect))
+ to_chat(H, "You cannot wrap this.")
+ return
+ H.visible_message("[H] starts to wrap [A] into a cocoon!","You start to wrap [A] into a cocoon.")
if(!do_after(H, 10 SECONDS, 1, A))
to_chat(H, "Your web spinning was interrupted!")
return