cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 14:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaking hologram colours.

Browse Source
This commit is contained in:
MistakeNot4892
2023-08-31 01:03:47 +10:00
parent c8d8d55c29
commit 7ea2cb5889
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_helpers/icons.dm
View File

@@ -876,10 +876,9 @@ world
if(4) I.pixel_y++ if(4) I.pixel_y++
overlays += I//And finally add the overlay. overlays += I//And finally add the overlay.
/proc/getHologramIcon(icon/A, safety=1, no_color = FALSE)//If safety is on, a new icon is not created. /proc/getHologramIcon(icon/A, safety=1)//If safety is on, a new icon is not created.
var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon. var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon.
if(!no_color) flat_icon.GrayScale() // Remove colour since we're going to be shading this as an image.
flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish.
flat_icon.ChangeOpacity(0.5)//Make it half transparent. flat_icon.ChangeOpacity(0.5)//Make it half transparent.
var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")//Scanline effect. var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")//Scanline effect.
flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.

2
code/game/machinery/camera/tracking.dm
View File

@@ -102,7 +102,7 @@
var/list/cameras = list() var/list/cameras = list()
/mob/living/silicon/ai/proc/trackable_mobs() /mob/living/silicon/ai/proc/trackable_mobs()
if(usr.stat == 2) if(usr.stat == DEAD)
return list() return list()
var/datum/trackable/TB = new() var/datum/trackable/TB = new()

4
code/game/objects/structures/holoplant.dm
View File

@@ -84,7 +84,7 @@
if(!state) if(!state)
state = pick(possible_plants) state = pick(possible_plants)
var/plant_icon = icon(icon, state) var/plant_icon = icon(icon, state)
return getHologramIcon(plant_icon, 0) return getHologramIcon(plant_icon, FALSE)
/obj/machinery/holoplant/emag_act() /obj/machinery/holoplant/emag_act()
if(emagged) if(emagged)
@@ -103,4 +103,4 @@
/obj/machinery/holoplant/shipped /obj/machinery/holoplant/shipped
anchored = FALSE anchored = FALSE
/obj/machinery/holoplant/shipped/Initialize() /obj/machinery/holoplant/shipped/Initialize()
. = ..() . = ..()

3
code/modules/integrated_electronics/subtypes/output.dm
View File

@@ -483,8 +483,7 @@
if(istype(AM) && assembly) if(istype(AM) && assembly)
if(AM in view(get_turf(src))) // It must be able to 'see' the object it will copy. if(AM in view(get_turf(src))) // It must be able to 'see' the object it will copy.
hologram = new(src) hologram = new(src)
var/icon/holo_icon = getHologramIcon(getFlatIcon(AM), no_color = TRUE) var/icon/holo_icon = getHologramIcon(getFlatIcon(AM))
// holo_icon.GrayScale() // So it looks better colored.
if(holo_color) // The color pin should ensure that it is a valid hex. if(holo_color) // The color pin should ensure that it is a valid hex.
holo_icon.ColorTone(holo_color) holo_icon.ColorTone(holo_color)
hologram.icon = holo_icon hologram.icon = holo_icon

14
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -54,7 +54,7 @@ var/global/list/ai_verbs_default = list(
var/aiRestorePowerRoutine = 0 var/aiRestorePowerRoutine = 0
var/viewalerts = 0 var/viewalerts = 0
var/icon/holo_icon//Default is assigned when AI is created. var/icon/holo_icon//Default is assigned when AI is created.
var/holo_color = null var/holo_color = "#7db4e1"
var/list/connected_robots = list() var/list/connected_robots = list()
var/obj/item/pda/ai/aiPDA = null var/obj/item/pda/ai/aiPDA = null
var/obj/item/communicator/aiCommunicator = null var/obj/item/communicator/aiCommunicator = null
@@ -627,11 +627,13 @@ var/global/list/ai_verbs_default = list(
if("Crew Member") //A seeable crew member (or a dog) if("Crew Member") //A seeable crew member (or a dog)
var/list/targets = trackable_mobs() var/list/targets = trackable_mobs()
if(targets.len) if(targets.len)
var/mob/living/Target var/mob/living/Target = input("Select a crew member:") as null|anything in targets //The definition of "crew member" is a little loose...
Target = input("Select a crew member:") as null|anything in targets //The definition of "crew member" is a little loose... if(!Target)
//This is torture, I know. If someone knows a better way... return
if(QDELETED(Target) || !Target) return Target = targets[Target]
var/new_holo = getHologramIcon(getCompoundIcon(targets[Target])) if(!istype(Target) || QDELETED(Target))
return
var/new_holo = getHologramIcon(getCompoundIcon(Target))
qdel(holo_icon) qdel(holo_icon)
holo_icon = new_holo holo_icon = new_holo