Map PDA Program - POIs (#19536)

![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/b8171abd-bb34-48cd-9d96-7d71c8a09441) ![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/a6def124-631c-4a2c-af62-8c9e95876502) ![image](https://github.com/Aurorastation/Aurora.3/assets/107256943/2a86a7ef-7a74-4bb2-999b-431ba40c19ee) --------- Co-authored-by: DreamySkrell <>
Aurorastation · Jul 24, 2024 · b488e51 · b488e51
1 parent 66bfc42
commit b488e51
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 11 deletions.
diff --git a/aurorastation.dme b/aurorastation.dme
@@ -2282,6 +2282,7 @@
 #include "code\modules\holodeck\HolodeckControl.dm"
 #include "code\modules\holodeck\HolodeckObjects.dm"
 #include "code\modules\holodeck\HolodeckPrograms.dm"
+#include "code\modules\holomap\poi.dm"
 #include "code\modules\http\forum_api.dm"
 #include "code\modules\http\forumuser_api.dm"
 #include "code\modules\http\http.dm"

diff --git a/code/controllers/subsystems/initialization/holomap.dm b/code/controllers/subsystems/initialization/holomap.dm
@@ -21,6 +21,9 @@ SUBSYSTEM_DEF(holomap)
 	/// Same as `minimaps_base64`, but does not discriminate between walls and paths.
 	var/list/minimaps_scan_base64 = list()
 
+	/// List of all `/obj/effect/landmark/minimap_poi`.
+	var/list/obj/effect/landmark/minimap_poi/pois = list()
+
 /datum/controller/subsystem/holomap/Initialize()
 	generate_all_minimaps()
 	LOG_DEBUG("SSholomap: [minimaps.len] maps.")
@@ -96,6 +99,8 @@ SUBSYSTEM_DEF(holomap)
 	for (var/thing in Z_TURFS(zlevel))
 		T = thing
 		A = T.loc
+		if (A.area_flags & AREA_FLAG_HIDE_FROM_HOLOMAP)
+			continue
 		if (A.holomap_color)
 			canvas.DrawBox(A.holomap_color + "99", T.x, T.y)
 

diff --git a/code/modules/holomap/poi.dm b/code/modules/holomap/poi.dm
@@ -0,0 +1,18 @@
+
+/obj/effect/landmark/minimap_poi
+	name = "minimap poi"
+	desc = null
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "minimap_poi"
+
+/obj/effect/landmark/minimap_poi/Initialize()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/landmark/minimap_poi/LateInitialize()
+	. = ..()
+	SSholomap.pois += src
+
+/obj/effect/landmark/minimap_poi/Destroy()
+	SSholomap.pois -= src
+	. = ..()
diff --git a/code/modules/modular_computers/file_system/programs/generic/map.dm b/code/modules/modular_computers/file_system/programs/generic/map.dm
@@ -45,6 +45,16 @@
 		list("d"="Hangar", "c"=HOLOMAP_AREACOLOR_HANGAR),
 	)
 
+	data["pois"] = list()
+	for(var/obj/effect/landmark/minimap_poi/poi as anything in SSholomap.pois)
+		data["pois"] += list(list(
+			"name" = poi.name,
+			"desc" = poi.desc,
+			"x" = poi.x,
+			"y" = poi.y,
+			"z" = poi.z,
+		))
+
 	return data
 
 /datum/computer_file/program/map/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)

diff --git a/html/changelogs/DreamySkrell-map-pois.yml b/html/changelogs/DreamySkrell-map-pois.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds map PDA program POIs."
diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi
diff --git a/maps/_common/areas/areas.dm b/maps/_common/areas/areas.dm
@@ -38,7 +38,7 @@ Generally you don't want to put your areas in here; if the area is only used in
 	no_light_control = 1
 	base_turf = /turf/space
 	is_outside = OUTSIDE_YES
-	area_flags = AREA_FLAG_IS_BACKGROUND
+	area_flags = AREA_FLAG_IS_BACKGROUND | AREA_FLAG_HIDE_FROM_HOLOMAP
 	nevergravity = TRUE //There's no gravity in space
 
 /area/space/atmosalert()

diff --git a/maps/_common/areas/station/command.dm b/maps/_common/areas/station/command.dm
@@ -70,6 +70,7 @@
 /area/bridge/selfdestruct
 	name = "Command - Station Authentication Terminal Safe"
 	icon_state = "bridge"
+	area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP
 
 /area/bridge/controlroom // Horizon.
 	name = "Command - Control Room"

diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm
@@ -337,7 +337,7 @@
 
 // Exterior
 /area/horizon/exterior
-	name = "Horizon - Exterior (DO NOT ENCROACH ON LANDING PLACES)"
+	name = "Horizon - Exterior"
 	icon_state = "exterior"
 	base_turf = /turf/space
 	dynamic_lighting = TRUE
@@ -346,6 +346,7 @@
 	no_light_control = TRUE
 	allow_nightmode = FALSE
 	ambience = AMBIENCE_SPACE
+	area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP
 
 /********** Maintenance Start **********/
 // Maintenance

diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -7493,6 +7493,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
+"fes" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/landmark/minimap_poi{
+	name = "Canary"
+	},
+/turf/simulated/floor/plating,
+/area/hangar/canary)
 "feD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -11233,6 +11242,12 @@
 	roof_type = null
 	},
 /area/horizon/custodial/disposals)
+"hGb" = (
+/obj/effect/landmark/minimap_poi{
+	name = "Main Lift"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/hallway/primary/aft)
 "hGu" = (
 /obj/structure/closet/crate,
 /obj/effect/floor_decal/corner/brown{
@@ -13060,6 +13075,15 @@
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos/propulsion/starboard)
+"jbh" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 10
+	},
+/obj/effect/landmark/minimap_poi{
+	name = "Spark"
+	},
+/turf/simulated/floor/tiled,
+/area/hangar/operations)
 "jbm" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
@@ -28389,6 +28413,12 @@
 /obj/random/loot,
 /turf/simulated/floor/plating,
 /area/maintenance/operations)
+"txK" = (
+/obj/effect/landmark/minimap_poi{
+	name = "Intrepid"
+	},
+/turf/simulated/floor/plating,
+/area/hangar/intrepid)
 "txT" = (
 /obj/structure/table/rack,
 /obj/item/clothing/suit/hazmat/anomaly,
@@ -50818,7 +50848,7 @@ umt
 wkD
 cua
 rcA
-oXD
+jbh
 wSS
 ixU
 pgW
@@ -55917,7 +55947,7 @@ pTd
 kyK
 oSi
 kaM
-iRC
+txK
 iRC
 xsx
 eSV
@@ -56882,7 +56912,7 @@ rHK
 rHK
 rHK
 rHK
-kuh
+hGb
 bec
 wLL
 ovg
@@ -61576,7 +61606,7 @@ vqx
 hot
 nNh
 pPV
-pEk
+fes
 oji
 hmD
 kOp

diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -6199,6 +6199,9 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_two)
 "cOp" = (
+/obj/effect/landmark/minimap_poi{
+	name = "Research"
+	},
 /turf/simulated/floor/wood,
 /area/rnd/hallway/secondary)
 "cOs" = (
@@ -23537,6 +23540,9 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 4
 	},
+/obj/effect/landmark/minimap_poi{
+	name = "Operations"
+	},
 /turf/simulated/floor/tiled,
 /area/operations/office)
 "kOW" = (
@@ -27397,6 +27403,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/warden)
+"mGv" = (
+/obj/effect/landmark/minimap_poi{
+	name = "Main Lift"
+	},
+/turf/simulated/wall/r_wall,
+/area/hallway/primary/central_one)
 "mGY" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
@@ -28809,6 +28821,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/grauwolf)
+"njk" = (
+/obj/effect/landmark/minimap_poi{
+	name = "Medbay"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/gen_treatment)
 "nju" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -29408,6 +29426,9 @@
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
+/obj/effect/landmark/minimap_poi{
+	name = "Service"
+	},
 /turf/simulated/floor/wood,
 /area/horizon/crew_quarters/lounge/bar)
 "nAz" = (
@@ -43609,6 +43630,9 @@
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 6
 	},
+/obj/effect/landmark/minimap_poi{
+	name = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "uki" = (
@@ -48844,6 +48868,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/effect/landmark/minimap_poi{
+	name = "Security"
+	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/hallway)
 "wzN" = (
@@ -70641,7 +70668,7 @@ nbd
 abA
 weX
 iyl
-xqE
+njk
 pUI
 bCl
 iIf
@@ -73861,7 +73888,7 @@ iVp
 iVp
 iVp
 iVp
-nUN
+mGv
 vcv
 lPO
 vbk