cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

allows mimics to spawn again, fixes mob_spawner runtime (#7334)

Browse Source
This commit is contained in:
Kashargul
2023-12-06 21:27:21 +01:00
committed by GitHub
parent 21b6370c0f
commit e87a358334
4 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/mob_spawner_vr.dm
+26 -8
View File
@@ -29,8 +29,15 @@
/obj/structure/mob_spawner/Destroy()
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in spawned_mobs)
L.nest = null
//CHOMPEdit Start
for(var/spawned in spawned_mobs)
if(istype(spawned, /mob/living))
var/mob/living/L = spawned
L.nest = null
if(istype(spawned, /obj/structure/closet/crate/mimic))
var/obj/structure/closet/crate/mimic/O = spawned
O.nest = null
//CHOMPEdit End
spawned_mobs.Cut()
return ..()
@@ -56,15 +63,26 @@
/obj/structure/mob_spawner/proc/do_spawn(var/mob_path)
if(!ispath(mob_path))
return 0
var/mob/living/L = new mob_path(get_turf(src))
L.nest = src
spawned_mobs.Add(L)
//CHOMPEdit Start
if(!ispath(mob_path, /mob/living) && !ispath(mob_path, /obj/structure/closet/crate/mimic))
return 0
last_spawn = world.time
if(total_spawns > 0)
total_spawns--
if(mob_faction)
L.faction = mob_faction
return L
if(ispath(mob_path, /mob/living))
var/mob/living/L = new mob_path(get_turf(src))
L.nest = src
spawned_mobs.Add(L)
if(mob_faction)
L.faction = mob_faction
return L
if(ispath(mob_path, /obj/structure/closet/crate/mimic))
var/obj/structure/closet/crate/mimic/O = new mob_path(get_turf(src))
spawned_mobs.Add(O)
O.nest = src
return O
return 0
//CHOMPEdit End
/obj/structure/mob_spawner/proc/get_death_report(var/mob/living/L)
if(L in spawned_mobs)