From eeca206ccf5c5e72b8e0d3fe5d4c68117af33502 Mon Sep 17 00:00:00 2001
From: matttheficus <57759731+matttheficus@users.noreply.github.com>
Date: Mon, 24 Jul 2023 10:16:00 -0400
Subject: [PATCH] Removes Green Giant Spider from Gold Slime Cores (#21615)

* begone dchat and admin spam

* sirryan review
---
 code/game/objects/effects/spiders.dm                         | 5 +----
 .../modules/mob/living/simple_animal/hostile/giant_spider.dm | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index abff1c210af..5132550a95c 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -57,8 +57,6 @@
 	icon_state = "eggs"
 	var/amount_grown = 0
 	var/player_spiders = FALSE
-	///Was this egg laid by a xenobiology mob? Used for mob capping
-	var/xenobiology_spawned = FALSE
 	var/list/faction = list("spiders")
 	flags_2 = CRITICAL_ATOM_2
 
@@ -80,7 +78,6 @@
 			var/obj/structure/spider/spiderling/S = new /obj/structure/spider/spiderling(loc)
 			S.faction = faction.Copy()
 			S.master_commander = master_commander
-			S.xenobiology_spawned = xenobiology_spawned
 			if(player_spiders)
 				S.player_spiders = TRUE
 		qdel(src)
@@ -108,7 +105,7 @@
 	pixel_y = rand(6,-6)
 	START_PROCESSING(SSobj, src)
 	AddComponent(/datum/component/swarming)
-	ADD_TRAIT(src, TRAIT_EDIBLE_BUG, "edible_bug") // Normally this is just used for mobs, but spiderlings are kind of that... 
+	ADD_TRAIT(src, TRAIT_EDIBLE_BUG, "edible_bug") // Normally this is just used for mobs, but spiderlings are kind of that...
 
 /obj/structure/spider/spiderling/Destroy()
 	STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 573da468ee6..b9fa11bcbb9 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -76,6 +76,7 @@
 	health = 40
 	melee_damage_lower = 5
 	melee_damage_upper = 10
+	gold_core_spawnable = NO_SPAWN
 	venom_per_bite = 30
 	var/atom/cocoon_target
 	var/fed = 0
@@ -281,7 +282,6 @@
 	var/obj/structure/spider/eggcluster/C = new /obj/structure/spider/eggcluster(loc)
 	C.faction = faction.Copy()
 	C.master_commander = master_commander
-	C.xenobiology_spawned = xenobiology_spawned
 	if(ckey)
 		C.player_spiders = TRUE
 	fed--