cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 21:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Icarus drones spawning indoors, carps/drones not having night vision (#10339)

Browse Source
This commit is contained in:
fernerr
2020-10-24 23:03:28 +02:00
committed by GitHub
parent c155f0b171
commit 9a7b84378e
6 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_helpers/turfs.dm
View File

@@ -25,7 +25,7 @@
return 0
return 1
/proc/get_random_turf_in_range(var/atom/origin, var/outer_range, var/inner_range, var/check_density)
/proc/get_random_turf_in_range(var/atom/origin, var/outer_range, var/inner_range, var/check_density, var/check_indoors)
origin = get_turf(origin)
if(!origin)
return
@@ -38,6 +38,10 @@
continue
if(check_density && turf_contains_dense_objects(T))
continue
if(check_indoors)
var/area/A = get_area(T)
if(A.station_area)
continue
if(!inner_range || get_dist(origin, T) >= inner_range)
turfs += T
if(turfs.len)

2
code/modules/events/carp_migration.dm
View File

@@ -54,7 +54,7 @@
if(spawn_drones && prob(25))
var/drone_num = rand(1, 2)
for(var/d = 1, d <= drone_num, d++)
new /mob/living/simple_animal/hostile/icarus_drone(get_random_turf_in_range(spawn_locations[i], 10, 6, TRUE))
new /mob/living/simple_animal/hostile/icarus_drone(get_random_turf_in_range(spawn_locations[i], 10, 6, TRUE, TRUE))
for(var/j = 1, j <= group_size, j++)
if(prob(95))
var/mob/living/simple_animal/hostile/carp/carp = new(spawn_locations[i])

2
code/modules/mob/living/simple_animal/hostile/carp.dm
View File

@@ -43,6 +43,8 @@
attack_emote = "nashes at"
flying = TRUE
see_in_dark = 8
see_invisible = SEE_INVISIBLE_NOLIGHTING
/mob/living/simple_animal/hostile/carp/Allow_Spacemove(var/check_drift = 0)
return 1 //No drifting in space for space carp! //original comments do not steal

2
code/modules/mob/living/simple_animal/hostile/icarus_drone.dm
View File

@@ -54,6 +54,8 @@
tameable = FALSE
flying = TRUE
see_in_dark = 8
see_invisible = SEE_INVISIBLE_NOLIGHTING
/mob/living/simple_animal/hostile/icarus_drone/Initialize()
. = ..()

4
code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm
View File

@@ -30,8 +30,6 @@
destroy_surroundings = 1
emote_see = list("stares","hovers ominously","blinks")
see_in_dark = 8
see_invisible = SEE_INVISIBLE_NOLIGHTING
min_oxy = 0
max_oxy = 0
@@ -46,6 +44,8 @@
faction = "cavern"
flying = TRUE
see_in_dark = 8
see_invisible = SEE_INVISIBLE_NOLIGHTING
/mob/living/simple_animal/hostile/retaliate/cavern_dweller/Allow_Spacemove(var/check_drift = 0)
return 1