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

Spiders inject fewer spiderlings

Browse Source
This commit is contained in:
Anewbe
2017-01-31 21:57:39 -06:00
parent 867c0ba2f4
commit fd1ade9982
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/effects/spiders.dm
View File

@@ -77,6 +77,8 @@
desc = "They seem to pulse slightly with an inner life" desc = "They seem to pulse slightly with an inner life"
icon_state = "eggs" icon_state = "eggs"
var/amount_grown = 0 var/amount_grown = 0
var/spiders_min = 6
var/spiders_max = 24
New() New()
pixel_x = rand(3,-3) pixel_x = rand(3,-3)
pixel_y = rand(3,-3) pixel_y = rand(3,-3)
@@ -97,7 +99,7 @@
/obj/effect/spider/eggcluster/process() /obj/effect/spider/eggcluster/process()
amount_grown += rand(0,2) amount_grown += rand(0,2)
if(amount_grown >= 100) if(amount_grown >= 100)
var/num = rand(6,24) var/num = rand(spiders_min, spiders_max)
var/obj/item/organ/external/O = null var/obj/item/organ/external/O = null
if(istype(loc, /obj/item/organ/external)) if(istype(loc, /obj/item/organ/external))
O = loc O = loc
@@ -108,6 +110,10 @@
O.implants += spiderling O.implants += spiderling
qdel(src) qdel(src)
/obj/effect/spider/eggcluster/small
spiders_min = 1
spiders_max = 3
/obj/effect/spider/spiderling /obj/effect/spider/spiderling
name = "spiderling" name = "spiderling"
desc = "It never stays still for long." desc = "It never stays still for long."

13
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
View File

@@ -29,7 +29,7 @@
cold_damage_per_tick = 20 cold_damage_per_tick = 20
var/poison_per_bite = 5 var/poison_per_bite = 5
var/poison_chance = 10 var/poison_chance = 10
var/poison_type = "toxin" var/poison_type = "spidertoxin"
faction = "spiders" faction = "spiders"
var/busy = 0 var/busy = 0
pass_flags = PASSTABLE pass_flags = PASSTABLE
@@ -85,9 +85,14 @@
if(prob(5)) if(prob(5))
var/obj/item/organ/external/O = pick(H.organs) var/obj/item/organ/external/O = pick(H.organs)
if(!(O.robotic >= ORGAN_ROBOT)) if(!(O.robotic >= ORGAN_ROBOT))
var/eggs = PoolOrNew(/obj/effect/spider/eggcluster/, list(O, src)) var/eggcount
O.implants += eggs for(var/obj/I in O.implants)
H << "<span class='warning'>The [src] injects something into your [O.name]!</span>" if(istype(I, /obj/effect/spider/eggcluster))
eggcount ++
if(!eggcount)
var/eggs = PoolOrNew(/obj/effect/spider/eggcluster/small, list(O, src))
O.implants += eggs
H << "<span class='warning'>The [src] injects something into your [O.name]!</span>"
/mob/living/simple_animal/hostile/giant_spider/Life() /mob/living/simple_animal/hostile/giant_spider/Life()
..() ..()