cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a cap to Xenobiology Mobs and Allows Sentient Giant Spider prompts to be disabled (#17316)

Browse Source 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
This commit is contained in:
Sirryan2002
2022-01-16 18:54:10 +01:00
committed by GitHub
co-authored by dearmochi
parent 41ac99506d
commit 1da61d4d27
7 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+11 -7
View File
@@ -1,6 +1,3 @@
//generic procs copied from obj/effect/alien
#define SPIDER_SOFT_CAP 30
#define SPIDER_HARD_CAP 40
/obj/structure/spider
name = "web"
desc = "it's stringy and sticky"
@@ -60,6 +57,8 @@
icon_state = "eggs"
var/amount_grown = 0
var/player_spiders = 0
///Was this egg laid by a xenobiology mob? Used for mob capping
var/xenobiology_spawned = FALSE
var/list/faction = list("spiders")
/obj/structure/spider/eggcluster/Initialize(mapload)
@@ -69,7 +68,7 @@
START_PROCESSING(SSobj, src)
/obj/structure/spider/eggcluster/process()
if(SSmobs.giant_spiders > SPIDER_SOFT_CAP) //eggs gonna chill out until there is less spiders
if(SSmobs.xenobiology_mobs > MAX_GOLD_CORE_MOBS - 10) //eggs gonna chill out until there is less spiders
return
amount_grown += rand(0, 2)
@@ -80,6 +79,7 @@
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)
@@ -98,6 +98,8 @@
var/player_spiders = 0
var/list/faction = list("spiders")
var/selecting_player = 0
///Is this spiderling created from a xenobiology mob?
var/xenobiology_spawned = FALSE
/obj/structure/spider/spiderling/Initialize(mapload)
. = ..()
@@ -174,19 +176,21 @@
if(isturf(loc))
amount_grown += rand(0,2)
if(amount_grown >= 100)
if(SSmobs.giant_spiders > SPIDER_HARD_CAP)
if(SSmobs.xenobiology_mobs > MAX_GOLD_CORE_MOBS && xenobiology_spawned)
qdel(src)
return
if(!grow_as)
grow_as = pick(typesof(/mob/living/simple_animal/hostile/poison/giant_spider))
var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(loc)
SSmobs.giant_spiders++
S.faction = faction.Copy()
S.master_commander = master_commander
S.xenobiology_spawned = xenobiology_spawned
if(xenobiology_spawned)
SSmobs.xenobiology_mobs++
if(player_spiders && !selecting_player)
selecting_player = 1
spawn()
var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a giant spider?", ROLE_GSPIDER, TRUE, source = S)
var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a giant spider?", ROLE_SENTIENT, TRUE, source = S)
if(length(candidates) && !QDELETED(S))
var/mob/C = pick(candidates)