cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 09:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

5

Browse Source
This commit is contained in:
kevinz000
2018-10-11 20:11:46 -07:00
parent 0e2b731317
commit 53df5c3115
115 changed files with 3396 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/holomap/holomap_datum.dm
View File

@@ -8,9 +8,9 @@
if(!station_map || reinit)
station_map = image(SSholomaps.extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAP]_[T.z]"])
if(!cursor || reinit)
cursor = image('icons/holomap_markers_vr.dmi', "you")
cursor = image('icons/holomap_markers.dmi', "you")
if(!legend || reinit)
legend = image('icons/effects/64x64_vr.dmi', "legend")
legend = image('icons/effects/64x64.dmi', "legend_sc")
if(isAI)
T = get_turf(user.client.eye)
@@ -24,8 +24,8 @@
station_map.overlays |= legend
/datum/station_holomap/proc/initialize_holomap_bogus()
station_map = image('icons/480x480_vr.dmi', "stationmap")
legend = image('icons/effects/64x64_vr.dmi', "notfound")
station_map = image('icons/480x480.dmi', "stationmap")
legend = image('icons/effects/64x64.dmi', "notfound")
legend.pixel_x = 7 * WORLD_ICON_SIZE
legend.pixel_y = 7 * WORLD_ICON_SIZE
station_map.overlays |= legend

14
code/modules/holomap/station_holomap.dm
View File

@@ -4,7 +4,7 @@
/obj/machinery/station_map
name = "station holomap"
desc = "A virtual map of the surrounding station."
icon = 'icons/obj/machines/stationmap_vr.dmi'
icon = 'icons/obj/machines/stationmap.dmi'
icon_state = "station_map"
anchored = 1
density = 0
@@ -67,7 +67,7 @@
// small_station_map.plane = LIGHTING_PLANE // Not until we do planes ~Leshana
// small_station_map.layer = LIGHTING_LAYER+1 // Weird things will happen!
floor_markings = image('icons/obj/machines/stationmap_vr.dmi', "decal_station_map")
floor_markings = image('icons/obj/machines/stationmap.dmi', "decal_station_map")
floor_markings.dir = src.dir
// floor_markings.plane = ABOVE_TURF_PLANE // Not until we do planes ~Leshana
// floor_markings.layer = DECAL_LAYER
@@ -123,8 +123,8 @@
user.client.images |= holomap_datum.station_map
watching_mob = user
moved_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
dir_set_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
GLOB.moved_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
GLOB.dir_set_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
destroyed_event.register(watching_mob, src, /obj/machinery/station_map/proc/stopWatching)
update_use_power(2)
@@ -152,8 +152,8 @@
var/mob/M = watching_mob
spawn(5) //we give it time to fade out
M.client.images -= holomap_datum.station_map
moved_event.unregister(watching_mob, src)
dir_set_event.unregister(watching_mob, src)
GLOB.moved_event.unregister(watching_mob, src)
GLOB.dir_set_event.unregister(watching_mob, src)
destroyed_event.unregister(watching_mob, src)
watching_mob = null
update_use_power(1)
@@ -228,7 +228,7 @@
x_offset = WORLD_ICON_SIZE
y_offset = WORLD_ICON_SIZE
circuit = /obj/item/weapon/circuitboard/station_map
icon_override = 'icons/obj/machines/stationmap_vr.dmi'
icon_override = 'icons/obj/machines/stationmap.dmi'
/datum/frame/frame_types/station_map/get_icon_state(var/state)
return "station_map_frame_[state]"