cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-07-03 16:50:16 -07:00
committed by GitHub
parent 063f1cf3aa
commit f7fb2e7ca9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/events/spider_infestation.dm
View File

@@ -22,15 +22,10 @@
if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry)) if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry))
continue continue
if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels)) if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
<<<<<<< HEAD if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change to 10 from 50 in order for spawns to work.
if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.
vents += temp_vent
=======
if(temp_vent.network.normal_members.len > 50)
var/area/A = get_area(temp_vent) var/area/A = get_area(temp_vent)
if(!(A.forbid_events)) if(!(A.forbid_events))
vents += temp_vent vents += temp_vent
>>>>>>> eb06a4b9e2... Merge pull request #13220 from Heroman3003/forbid-events
while((spawncount >= 1) && vents.len) while((spawncount >= 1) && vents.len)
var/obj/vent = pick(vents) var/obj/vent = pick(vents)