diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index 135fd92479c..348924c7d7b 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -9,7 +9,7 @@ //Makes some spiderlings. Good for setting traps and causing general trouble. /obj/effect/proc_holder/changeling/spiders/sting_action(var/mob/user) for(var/i=0, i<2, i++) - var/obj/effect/spider/spiderling/S = new(user.loc) + var/obj/structure/spider/spiderling/S = new(user.loc) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter feedback_add_details("changeling_powers","SI") diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index b59f1fd8454..d3e60b2fb98 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -165,7 +165,7 @@ /obj/item/organ/internal/gland/spiderman/activate() to_chat(owner, "You feel something crawling in your skin.") owner.faction |= "spiders" - new /obj/effect/spider/spiderling(owner.loc) + new /obj/structure/spider/spiderling(owner.loc) /obj/item/organ/internal/gland/egg origin_tech = "materials=4;biotech=6;abductor=3" diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 848c681576c..8ed8d045de4 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -1,5 +1,5 @@ //generic procs copied from obj/effect/alien -/obj/effect/spider +/obj/structure/spider name = "web" desc = "it's stringy and sticky" icon = 'icons/effects/effects.dmi' @@ -8,7 +8,7 @@ var/health = 15 //similar to weeds, but only barfed out by nurses manually -/obj/effect/spider/ex_act(severity) +/obj/structure/spider/ex_act(severity) switch(severity) if(1.0) qdel(src) @@ -20,7 +20,7 @@ qdel(src) return -/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/structure/spider/attackby(var/obj/item/weapon/W, var/mob/user, params) if(W.attack_verb.len) visible_message("[user] has [pick(W.attack_verb)] \the [src] with \the [W]!") else @@ -38,28 +38,28 @@ health -= damage healthcheck() -/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/spider/bullet_act(var/obj/item/projectile/Proj) ..() health -= Proj.damage healthcheck() -/obj/effect/spider/proc/healthcheck() +/obj/structure/spider/proc/healthcheck() if(health <= 0) qdel(src) -/obj/effect/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) health -= 5 healthcheck() -/obj/effect/spider/stickyweb +/obj/structure/spider/stickyweb icon_state = "stickyweb1" -/obj/effect/spider/stickyweb/New() +/obj/structure/spider/stickyweb/New() if(prob(50)) icon_state = "stickyweb2" -/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0) +/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0) if(height==0) return 1 if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider)) return 1 @@ -71,7 +71,7 @@ return prob(30) return 1 -/obj/effect/spider/eggcluster +/obj/structure/spider/eggcluster name = "egg cluster" desc = "They seem to pulse slightly with an inner life" icon_state = "eggs" @@ -80,24 +80,24 @@ var/faction = list() var/master_commander = null -/obj/effect/spider/eggcluster/New() +/obj/structure/spider/eggcluster/New() pixel_x = rand(3,-3) pixel_y = rand(3,-3) processing_objects.Add(src) -/obj/effect/spider/eggcluster/process() +/obj/structure/spider/eggcluster/process() amount_grown += rand(0,2) if(amount_grown >= 100) var/num = rand(3,12) for(var/i=0, i[src] dies!") new /obj/effect/decal/cleanable/spiderling_remains(src.loc) qdel(src) -/obj/effect/spider/spiderling/healthcheck() +/obj/structure/spider/spiderling/healthcheck() if(health <= 0) die() -/obj/effect/spider/spiderling/process() +/obj/structure/spider/spiderling/process() if(travelling_in_vent) if(istype(src.loc, /turf)) travelling_in_vent = 0 @@ -217,16 +217,16 @@ icon_state = "greenshatter" anchored = 1 -/obj/effect/spider/cocoon +/obj/structure/spider/cocoon name = "cocoon" desc = "Something wrapped in silky spider web" icon_state = "cocoon1" health = 60 -/obj/effect/spider/cocoon/New() +/obj/structure/spider/cocoon/New() icon_state = pick("cocoon1","cocoon2","cocoon3") -/obj/effect/spider/cocoon/Destroy() +/obj/structure/spider/cocoon/Destroy() src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 8e4a5834ba2..c5a5873afa0 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -77,7 +77,7 @@ max_number = 6 vermstring = "lizards" if(VERM_SPIDERS) - spawn_types = list(/obj/effect/spider/spiderling) + spawn_types = list(/obj/structure/spider/spiderling) max_number = 3 vermstring = "spiders" @@ -89,7 +89,7 @@ num-- if(vermin == VERM_SPIDERS) - var/obj/effect/spider/spiderling/S = new(T) + var/obj/structure/spider/spiderling/S = new(T) S.amount_grown = -1 else var/spawn_type = pick(spawn_types) diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index ab703f0edc9..90cc1ee28ad 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -22,7 +22,7 @@ while((spawncount >= 1) && vents.len) var/obj/vent = pick(vents) - var/obj/effect/spider/spiderling/S = new(vent.loc) + var/obj/structure/spider/spiderling/S = new(vent.loc) if(prob(66)) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse vents -= vent diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index aed998713c2..ebcf1346db9 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -37,7 +37,7 @@ spawncount = 1 while(spawncount >= 1 && vents.len) var/obj/vent = pick(vents) - var/obj/effect/spider/spiderling/terror_spiderling/S = new(vent.loc) + var/obj/structure/spider/spiderling/terror_spiderling/S = new(vent.loc) S.name = "evil-looking spiderling" S.grow_as = spider_type S.amount_grown = 75 diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 21a810d7b2f..46f6f317434 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -485,7 +485,7 @@ log_game("[key_name(user)] caused spiderling pests to spawn in a hydro tray") visible_message("The pests seem to behave oddly...") for(var/i in 1 to 3) - var/obj/effect/spider/spiderling/S = new(get_turf(src)) + var/obj/structure/spider/spiderling/S = new(get_turf(src)) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter else to_chat(user, "The pests seem to behave oddly, but quickly settle down...") diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index b691099d0f3..7148f780ff3 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -229,7 +229,7 @@ //Different classes of items give different commodities. if(istype(W,/obj/item/weapon/cigbutt)) stored_comms["plastic"]++ - else if(istype(W,/obj/effect/spider/spiderling)) + else if(istype(W,/obj/structure/spider/spiderling)) stored_comms["wood"]++ stored_comms["wood"]++ stored_comms["plastic"]++ 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 368626f49fe..e45d5a1a391 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -116,7 +116,7 @@ GiveUp(C) return //second, spin a sticky spiderweb on this tile - var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) + var/obj/structure/spider/stickyweb/W = locate() in get_turf(src) if(!W) Web() else @@ -157,7 +157,7 @@ stop_automated_movement = 1 spawn(40) if(busy == SPINNING_WEB && src.loc == T) - new /obj/effect/spider/stickyweb(T) + new /obj/structure/spider/stickyweb(T) busy = 0 stop_automated_movement = 0 @@ -187,7 +187,7 @@ spawn(50) if(busy == SPINNING_COCOON) if(cocoon_target && istype(cocoon_target.loc, /turf) && get_dist(src,cocoon_target) <= 1) - var/obj/effect/spider/cocoon/C = new(cocoon_target.loc) + var/obj/structure/spider/cocoon/C = new(cocoon_target.loc) var/large_cocoon = 0 C.pixel_x = cocoon_target.pixel_x C.pixel_y = cocoon_target.pixel_y @@ -223,7 +223,7 @@ set category = "Spider" set desc = "Lay a clutch of eggs, but you must wrap a creature for feeding first." - var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) + var/obj/structure/spider/eggcluster/E = locate() in get_turf(src) if(E) to_chat(src, "There is already a cluster of eggs here!") else if(!fed) @@ -236,7 +236,7 @@ if(busy == LAYING_EGGS) E = locate() in get_turf(src) if(!E) - var/obj/effect/spider/eggcluster/C = new /obj/effect/spider/eggcluster(src.loc) + var/obj/structure/spider/eggcluster/C = new /obj/structure/spider/eggcluster(src.loc) C.faction = faction C.master_commander = master_commander if(ckey) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm index 98e0967c669..90cef39a98f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm @@ -112,11 +112,11 @@ else if(istype(loc, /turf/space)) to_chat(src, "Webs cannot be spun in space.") else - var/obj/effect/spider/terrorweb/T = locate() in get_turf(src) + var/obj/structure/spider/terrorweb/T = locate() in get_turf(src) if(T) to_chat(src, "There is already a web here.") else - var/obj/effect/spider/terrorweb/W = new /obj/effect/spider/terrorweb(loc) + var/obj/structure/spider/terrorweb/W = new /obj/structure/spider/terrorweb(loc) W.creator_ckey = ckey if(thick) W.opacity = 1 @@ -125,7 +125,7 @@ W.infectious = 1 W.name = "sharp terror web" -/obj/effect/spider/terrorweb +/obj/structure/spider/terrorweb name = "terror web" desc = "it's stringy and sticky" icon = 'icons/effects/effects.dmi' @@ -136,18 +136,18 @@ var/creator_ckey = null var/infectious = 0 -/obj/effect/spider/terrorweb/New() +/obj/structure/spider/terrorweb/New() ..() if(prob(50)) icon_state = "stickyweb2" -/obj/effect/spider/terrorweb/proc/DeCloakNearby() +/obj/structure/spider/terrorweb/proc/DeCloakNearby() for(var/mob/living/simple_animal/hostile/poison/terror_spider/gray/G in view(6,src)) if(!G.ckey && G.stat != DEAD) G.GrayDeCloak() G.Aggro() -/obj/effect/spider/terrorweb/CanPass(atom/movable/mover, turf/target) +/obj/structure/spider/terrorweb/CanPass(atom/movable/mover, turf/target) if(istype(mover, /mob/living/simple_animal/hostile/poison/terror_spider)) return 1 if(istype(mover, /obj/item/projectile/terrorqueenspit)) @@ -178,7 +178,7 @@ return prob(20) return ..() -/obj/effect/spider/terrorweb/bullet_act(obj/item/projectile/Proj) +/obj/structure/spider/terrorweb/bullet_act(obj/item/projectile/Proj) if(Proj.damage_type != BRUTE && Proj.damage_type != BURN) visible_message("[src] is undamaged by [Proj]!") // Webs don't care about disablers, tasers, etc. Or toxin damage. They're organic, but not alive. @@ -196,7 +196,7 @@ choices += L for(var/obj/O in oview(1,src)) if(Adjacent(O) && !O.anchored) - if(!istype(O, /obj/effect/spider/terrorweb) && !istype(O, /obj/effect/spider/cocoon) && !istype(O, /obj/effect/spider/spiderling/terror_spiderling)) + if(!istype(O, /obj/structure/spider/terrorweb) && !istype(O, /obj/structure/spider/cocoon) && !istype(O, /obj/structure/spider/spiderling/terror_spiderling)) choices += O if(choices.len) cocoon_target = input(src,"What do you wish to cocoon?") in null|choices @@ -215,7 +215,7 @@ if(do_after(src, 40, target = cocoon_target.loc)) if(busy == SPINNING_COCOON) if(cocoon_target && isturf(cocoon_target.loc) && get_dist(src,cocoon_target) <= 1) - var/obj/effect/spider/cocoon/C = new(cocoon_target.loc) + var/obj/structure/spider/cocoon/C = new(cocoon_target.loc) var/large_cocoon = 0 C.pixel_x = cocoon_target.pixel_x C.pixel_y = cocoon_target.pixel_y diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm index 750ba694a1b..2d2c9af9bda 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm @@ -74,7 +74,7 @@ var/numlings = input("How many?") as null|anything in list(10, 20, 30, 40, 50) var/sbpc = input("%chance to be stillborn?") as null|anything in list(0, 25, 50, 75, 100) for(var/i=0, iThrough the hivemind, the raw power of [src] floods into your body, burning it from the inside out!") - for(var/obj/effect/spider/eggcluster/terror_eggcluster/T in ts_egg_list) + for(var/obj/structure/spider/eggcluster/terror_eggcluster/T in ts_egg_list) qdel(T) - for(var/obj/effect/spider/spiderling/terror_spiderling/T in ts_spiderling_list) + for(var/obj/structure/spider/spiderling/terror_spiderling/T in ts_spiderling_list) T.stillborn = 1 to_chat(src, "All Terror Spiders, except yourself, will die off shortly.") diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm index 61c0ed42a25..fdaa36257d2 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm @@ -119,7 +119,7 @@ GrayCloak() else // otherwise, pick one of the valid turfs with no web to create a web there. - new /obj/effect/spider/terrorweb(pick(g_turfs_valid)) + new /obj/structure/spider/terrorweb(pick(g_turfs_valid)) visible_message("[src] spins a web.") else if(invisibility == SEE_INVISIBLE_LEVEL_ONE) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm index ace7509ccdf..89378e6a2ae 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm @@ -30,7 +30,7 @@ greeneggs_action.Grant(src) /mob/living/simple_animal/hostile/poison/terror_spider/green/proc/DoLayGreenEggs() - var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) + var/obj/structure/spider/eggcluster/E = locate() in get_turf(src) if(E) to_chat(src, "There is already a cluster of eggs here!") else if(fed < feedings_to_lay) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm index e3eb1b1d49e..c3ee3dd6a35 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm @@ -46,10 +46,10 @@ if(T.stat != DEAD && !T.spider_placed && spider_awaymission == T.spider_awaymission) if(T.type == specific_type) numspiders += 1 - for(var/obj/effect/spider/eggcluster/terror_eggcluster/E in ts_egg_list) + for(var/obj/structure/spider/eggcluster/terror_eggcluster/E in ts_egg_list) if(E.spiderling_type == specific_type && E.z == z) numspiders += E.spiderling_number - for(var/obj/effect/spider/spiderling/terror_spiderling/L in ts_spiderling_list) + for(var/obj/structure/spider/spiderling/terror_spiderling/L in ts_spiderling_list) if(!L.stillborn && L.grow_as == specific_type && L.z == z) numspiders += 1 return numspiders \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm index fa162ab8848..b6e8a0680ae 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm @@ -36,7 +36,7 @@ if(canspawn) canspawn = 0 for(var/i in 0 to 30) - var/obj/effect/spider/spiderling/terror_spiderling/S = new /obj/effect/spider/spiderling/terror_spiderling(get_turf(src)) + var/obj/structure/spider/spiderling/terror_spiderling/S = new /obj/structure/spider/spiderling/terror_spiderling(get_turf(src)) S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray) if(prob(66)) S.stillborn = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm index 1a9b925d689..3b6266e777b 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm @@ -153,7 +153,7 @@ if(3) if(world.time > (spider_lastspawn + spider_spawnfrequency)) if(prob(20)) - var/obj/effect/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) + var/obj/structure/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) if(!N) spider_lastspawn = world.time DoLayTerrorEggs(/mob/living/simple_animal/hostile/poison/terror_spider/green, 2, 0) @@ -161,7 +161,7 @@ if(4) if(world.time > (spider_lastspawn + spider_spawnfrequency)) if(prob(20)) - var/obj/effect/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) + var/obj/structure/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) if(!N) spider_lastspawn = world.time DoLayTerrorEggs(/mob/living/simple_animal/hostile/poison/terror_spider/red, 2, 1) @@ -169,7 +169,7 @@ if(5) if(world.time > (spider_lastspawn + spider_spawnfrequency)) if(prob(20)) - var/obj/effect/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) + var/obj/structure/spider/eggcluster/terror_eggcluster/N = locate() in get_turf(src) if(!N) if(!spider_awaymission) QueenFakeLings() @@ -331,7 +331,7 @@ spider_can_fakelings-- var/numlings = 15 for(var/i in 1 to numlings) - var/obj/effect/spider/spiderling/terror_spiderling/S = new /obj/effect/spider/spiderling/terror_spiderling(get_turf(src)) + var/obj/structure/spider/spiderling/terror_spiderling/S = new /obj/structure/spider/spiderling/terror_spiderling(get_turf(src)) S.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/red S.stillborn = 1 S.name = "Evil-Looking Spiderling" diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm index f6188ced362..d1ffa073582 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm @@ -3,7 +3,7 @@ // ----------------- TERROR SPIDERS: SPIDERLINGS (USED BY GREEN, WHITE, QUEEN AND MOTHER TYPES) // -------------------------------------------------------------------------------- -/obj/effect/spider/spiderling/terror_spiderling +/obj/structure/spider/spiderling/terror_spiderling name = "spiderling" desc = "A fast-moving tiny spider, prone to making aggressive hissing sounds. Hope it doesn't grow up." icon_state = "spiderling" @@ -17,15 +17,15 @@ var/list/enemies = list() var/immediate_ventcrawl = 0 -/obj/effect/spider/spiderling/terror_spiderling/New() +/obj/structure/spider/spiderling/terror_spiderling/New() ..() ts_spiderling_list += src -/obj/effect/spider/spiderling/terror_spiderling/Destroy() +/obj/structure/spider/spiderling/terror_spiderling/Destroy() ts_spiderling_list -= src return ..() -/obj/effect/spider/spiderling/terror_spiderling/Bump(atom/A) +/obj/structure/spider/spiderling/terror_spiderling/Bump(atom/A) if(istype(A, /obj/structure/table)) forceMove(A.loc) else if(istype(A, /obj/machinery/recharge_station)) @@ -33,7 +33,7 @@ else ..() -/obj/effect/spider/spiderling/terror_spiderling/process() +/obj/structure/spider/spiderling/terror_spiderling/process() if(travelling_in_vent) if(isturf(loc)) travelling_in_vent = 0 @@ -104,7 +104,7 @@ /mob/living/simple_animal/hostile/poison/terror_spider/proc/DoLayTerrorEggs(lay_type, lay_number, lay_crawl) stop_automated_movement = 1 - var/obj/effect/spider/eggcluster/terror_eggcluster/C = new /obj/effect/spider/eggcluster/terror_eggcluster(get_turf(src)) + var/obj/structure/spider/eggcluster/terror_eggcluster/C = new /obj/structure/spider/eggcluster/terror_eggcluster(get_turf(src)) C.spiderling_type = lay_type C.spiderling_number = lay_number C.spiderling_ventcrawl = lay_crawl @@ -118,7 +118,7 @@ spawn(10) stop_automated_movement = 0 -/obj/effect/spider/eggcluster/terror_eggcluster +/obj/structure/spider/eggcluster/terror_eggcluster name = "terror egg cluster" desc = "A cluster of tiny spider eggs. They pulse with a strong inner life, and appear to have sharp thorns on the sides." icon_state = "eggs" @@ -130,7 +130,7 @@ var/spiderling_ventcrawl = 1 var/list/enemies = list() -/obj/effect/spider/eggcluster/terror_eggcluster/New() +/obj/structure/spider/eggcluster/terror_eggcluster/New() ..() ts_egg_list += src spawn(50) @@ -153,16 +153,16 @@ else if(spiderling_type == /mob/living/simple_animal/hostile/poison/terror_spider/queen) name = "queen of terror eggs" -/obj/effect/spider/eggcluster/terror_eggcluster/Destroy() +/obj/structure/spider/eggcluster/terror_eggcluster/Destroy() ts_egg_list -= src return ..() -/obj/effect/spider/eggcluster/terror_eggcluster/process() +/obj/structure/spider/eggcluster/terror_eggcluster/process() amount_grown += rand(0,2) if(amount_grown >= 100) var/num = spiderling_number for(var/i=0, i (last_spins_webs + freq_spins_webs)) last_spins_webs = world.time - var/obj/effect/spider/terrorweb/T = locate() in get_turf(src) + var/obj/structure/spider/terrorweb/T = locate() in get_turf(src) if(!T) - var/obj/effect/spider/terrorweb/W = new /obj/effect/spider/terrorweb(loc) + var/obj/structure/spider/terrorweb/W = new /obj/structure/spider/terrorweb(loc) if(web_infects) W.infectious = 1 W.name = "sharp terror web" @@ -275,7 +275,7 @@ var/list/potentials = list() for(var/turf/simulated/T in oview(3,get_turf(src))) if(T.density == 0 && get_dist(get_turf(src),T) == 3) - var/obj/effect/spider/terrorweb/W = locate() in T + var/obj/structure/spider/terrorweb/W = locate() in T if(!W) var/obj/structure/grille/G = locate() in T if(!G) @@ -288,7 +288,7 @@ var/list/webbed = list() for(var/turf/simulated/T in oview(3,get_turf(src))) if(T.density == 0 && get_dist(get_turf(src),T) == 3) - var/obj/effect/spider/terrorweb/W = locate() in T + var/obj/structure/spider/terrorweb/W = locate() in T if(W) webbed += T return webbed diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 9134715aac3..caff5e2017f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -168,7 +168,7 @@ var/global/list/ts_spiderling_list = list() visible_message("[src] harmlessly nuzzles [target].") T.CheckFaction() CheckFaction() - else if(istype(target, /obj/effect/spider/cocoon)) + else if(istype(target, /obj/structure/spider/cocoon)) to_chat(src, "Destroying our own cocoons would not help us.") else if(istype(target, /obj/machinery/door/firedoor)) var/obj/machinery/door/firedoor/F = target diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 8ddcf27593b..f062724f20c 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -82,7 +82,7 @@ //use up stored charges if(charges >= 10) charges -= 10 - new /obj/effect/spider/eggcluster(pick(view(1,src))) + new /obj/structure/spider/eggcluster(pick(view(1,src))) if(charges >= 3) if(prob(5)) diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index ded15ea8d59..24d76267b13 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -237,7 +237,7 @@ var/list/blacklist = list( /mob/living, /obj/structure/blob, - /obj/effect/spider/spiderling, + /obj/structure/spider/spiderling, /obj/item/weapon/disk/nuclear, /obj/machinery/nuclearbomb, /obj/item/device/radio/beacon, diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index 414a48cf5ab..0adca48bfd0 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -28,7 +28,7 @@ owner.emote("scream") var/spiders = rand(3,5) for(var/i in 1 to spiders) - new/obj/effect/spider/spiderling(get_turf(owner)) + new/obj/structure/spider/spiderling(get_turf(owner)) owner.visible_message("[owner] bursts open! Holy fuck!") owner.gib() @@ -86,17 +86,17 @@ owner.Stun(20) owner.Weaken(20) // yes, this is a long stun - that's intentional. Gotta give the spiderlings time to escape. - var/obj/effect/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner)) + var/obj/structure/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner)) S1.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/red S1.name = "red spiderling" if(prob(50)) S1.stillborn = 1 - var/obj/effect/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner)) + var/obj/structure/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner)) S2.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/gray S2.name = "gray spiderling" if(prob(50)) S2.stillborn = 1 - var/obj/effect/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner)) + var/obj/structure/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner)) S3.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/green S3.name = "green spiderling" if(prob(50))