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

Merge branch 'master' into morphevent

Browse Source
This commit is contained in:
Heroman3003
2020-01-16 09:00:43 +10:00
committed by GitHub
parent 5077419f4e a5b768eccc
commit 4af118cb0d
41 changed files with 437 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/events/drone_pod_vr.dm
View File

@@ -1,10 +1,10 @@
/datum/event/drone_pod_drop
announceWhen = 1
var/turf/land_target = null
var/attempt_amount = 10
/datum/event/drone_pod_drop/setup()
startWhen = rand(8,15)
announceWhen = startWhen + 5
if(LAZYLEN(using_map.meteor_strike_areas))
var/turf/potential_target = null
for(var/i=1, i <= attempt_amount, i++)
@@ -28,4 +28,4 @@
if(!land_target)
kill()
new /datum/random_map/droppod/supply(null, land_target.x-2, land_target.y-2, land_target.z, supplied_drops = list(/obj/structure/ghost_pod/manual/lost_drone))
new /datum/random_map/droppod/supply(null, land_target.x-2, land_target.y-2, land_target.z, supplied_drops = list(/obj/structure/ghost_pod/manual/lost_drone/dogborg))

6
code/modules/events/grubinfestation_vr.dm
View File

@@ -3,7 +3,6 @@
endWhen = 200
var/spawncount = 1
var/list/vents = list()
var/list/grubs = list()
var/give_positions = 0
/datum/event/grub_infestation/setup()
@@ -31,7 +30,7 @@
/datum/event/grub_infestation/end()
var/list/area_names = list()
for(var/grub in grubs)
for(var/grub in existing_solargrubs)
var/mob/living/G = grub
if(!G || G.stat == DEAD)
continue
@@ -43,5 +42,4 @@
area_names |= grub_area.name
if(area_names.len)
var/english_list = english_list(area_names)
command_announcement.Announce("Sensors have narrowed down remaining active solargrubs to the followng areas: [english_list]", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
grubs.Cut()
command_announcement.Announce("Sensors have narrowed down remaining active solargrubs to the followng areas: [english_list]", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')