cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-15 18:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes overmap pretty (#15752)

Browse Source
This commit is contained in:
kyres1
2023-02-09 10:32:14 -06:00
committed by GitHub
parent 8e8941563e
commit be8dac08c1
43 changed files with 218 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/maps/planet_types/barren.dm
+9 -5
View File
@@ -12,8 +12,8 @@
water_color = null
possible_random_ruins = list(
/datum/map_template/ruin/exoplanet/abandoned_mining,
/datum/map_template/ruin/exoplanet/hideout,
/datum/map_template/ruin/exoplanet/abandoned_mining,
/datum/map_template/ruin/exoplanet/hideout,
/datum/map_template/ruin/exoplanet/crashed_shuttle_01,
/datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01,
/datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01,
@@ -25,7 +25,7 @@
/datum/map_template/ruin/exoplanet/crashed_pod,
/datum/map_template/ruin/exoplanet/crashed_coc_skipjack,
/datum/map_template/ruin/exoplanet/drill_site)
/obj/effect/overmap/visitable/sector/exoplanet/barren/generate_habitability()
return HABITABILITY_BAD
@@ -59,6 +59,10 @@
if(prob(20))
overlays += image('icons/turf/decals/decals.dmi', "asteroid[rand(0,9)]")
/obj/effect/overmap/visitable/sector/exoplanet/barren/Initialize()
. = ..()
icon_state = "asteroid[rand(1,3)]"
/turf/simulated/floor/exoplanet/barren/Initialize()
. = ..()
update_icon()
@@ -79,8 +83,8 @@
planetary_area = /area/exoplanet/barren/asteroid
possible_random_ruins = list(
/datum/map_template/ruin/exoplanet/abandoned_mining,
/datum/map_template/ruin/exoplanet/hideout,
/datum/map_template/ruin/exoplanet/abandoned_mining,
/datum/map_template/ruin/exoplanet/hideout,
/datum/map_template/ruin/exoplanet/crashed_shuttle_01,
/datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01,
/datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01,
code/modules/overmap/_defines.dm
+1 -1
View File
@@ -11,7 +11,7 @@ var/global/list/map_sectors = list()
dynamic_lighting = 0
/turf/unsimulated/map
icon = 'icons/turf/space.dmi'
icon = 'icons/obj/overmap/overmap.dmi'
icon_state = "map"
permit_ao = FALSE
code/modules/overmap/contacts/_contacts.dm
+1 -1
View File
@@ -27,7 +27,7 @@
images += marker
radar = image(loc = effect, icon = 'icons/obj/overmap.dmi', icon_state = "sensor_range")
radar = image(loc = effect, icon = 'icons/obj/overmap/overmap_effects.dmi', icon_state = "sensor_range")
radar.color = source.color
radar.tag = "radar"
radar.add_filter("blur", 1, list("blur", size = 1))
code/modules/overmap/events/event.dm
+1 -1
View File
@@ -167,7 +167,7 @@
// And with them "existing" on the overmap Z-level things quickly get odd.
/obj/effect/overmap/event
name = "event"
icon = 'icons/obj/overmap.dmi'
icon = 'icons/obj/overmap/overmap_effects.dmi'
icon_state = "blank"
opacity = 0
var/list/events
code/modules/overmap/exoplanets/exoplanet.dm
+4 -2
View File
@@ -1,7 +1,5 @@
/obj/effect/overmap/visitable/sector/exoplanet
name = "exoplanet"
icon_state = "globe"
in_space = 0
var/area/planetary_area
var/list/seeds = list()
var/list/animals = list()
@@ -63,6 +61,10 @@
else
habitability_class = HABITABILITY_BAD
/obj/effect/overmap/visitable/sector/exoplanet/Initialize()
. = ..()
icon_state = "globe[rand(1,3)]"
/obj/effect/overmap/visitable/sector/exoplanet/New(nloc, max_x, max_y)
if(!current_map.use_overmap)
return
code/modules/overmap/overmap_object.dm
+2 -5
View File
@@ -1,6 +1,6 @@
/obj/effect/overmap
name = "map object"
icon = 'icons/obj/overmap.dmi'
icon = 'icons/obj/overmap/overmap_effects.dmi'
icon_state = "object"
color = "#fffffe"
@@ -71,9 +71,6 @@
for(var/obj/effect/overmap/visitable/O in loc)
SSskybox.rebuild_skyboxes(O.map_z)
/obj/effect/overmap/update_icon()
filters = filter(type="drop_shadow", color = color + "F0", size = 2, offset = 1, x = 0, y = 0)
/obj/effect/overmap/proc/signal_hit(var/list/hit_data)
return
@@ -109,7 +106,7 @@
if(do_after(usr, 5 SECONDS))
C.targeting = FALSE
targeting = O
O.targeted_overlay = icon('icons/obj/overmap_heads_up_display.dmi', "lock")
O.targeted_overlay = icon('icons/obj/overmap/overmap_effects.dmi', "lock")
O.add_overlay(O.targeted_overlay)
if(designation && class && !obfuscated)
if(!O.maptext)
code/modules/overmap/sectors.dm
+1 -1
View File
@@ -171,7 +171,7 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
/obj/effect/overmap/visitable/proc/toggle_distress_status()
has_called_distress_beacon = !has_called_distress_beacon
if(has_called_distress_beacon)
var/image/distress_overlay = image('icons/obj/overmap.dmi', "distress")
var/image/distress_overlay = image('icons/obj/overmap/overmap_effects.dmi', "distress")
applied_distress_overlay = distress_overlay
add_overlay(applied_distress_overlay)
filters = filter(type = "outline", size = 2, color = COLOR_RED)
code/modules/overmap/ships/ship.dm
+7 -1
View File
@@ -13,7 +13,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
/obj/effect/overmap/visitable/ship
name = "generic ship"
desc = "Space faring vessel."
icon_state = "ship"
icon = 'icons/obj/overmap/overmap_ships.dmi'
icon_state = "generic"
requires_contact = TRUE
obfuscated_name = "unidentified vessel"
var/moving_state = "ship_moving"
@@ -41,6 +42,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
comms_support = TRUE
var/list/colors = list() //Pick a color from this list on init
/obj/effect/overmap/visitable/ship/Initialize()
. = ..()
glide_size = world.icon_size
@@ -49,6 +52,9 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
base_sensor_visibility = round((vessel_mass/SENSOR_COEFFICENT),1)
SSshuttle.ships += src
if(LAZYLEN(colors))
color = pick(colors)
/obj/effect/overmap/visitable/ship/find_z_levels(var/fore_direction)
. = ..(fore_dir)