More light up console screens (#8904)

This commit is contained in:
Wowzewow (Wezzy)
2020-05-24 17:09:52 +08:00
committed by GitHub
parent 6ecca09be8
commit 3f9d4e6b2d
9 changed files with 81 additions and 24 deletions
+11 -11
View File
@@ -253,24 +253,23 @@
/obj/item/stock_parts/console_screen
)
/obj/machinery/body_scanconsole/Destroy()
if (connected)
connected.connected = null
return ..()
/obj/machinery/body_scanconsole/power_change()
..()
if(stat & BROKEN)
icon_state = "body_scannerconsole-p"
update_icon()
/obj/machinery/body_scanconsole/update_icon()
cut_overlays()
if((stat & BROKEN) || (stat & NOPOWER))
return
else
if (stat & NOPOWER)
spawn(rand(0, 15))
icon_state = "body_scannerconsole-p"
else
icon_state = initial(icon_state)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "body_scannerconsole-screen", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_RED)
/obj/machinery/body_scanconsole/proc/get_collapsed_lung_desc()
if (!connected || !connected.occupant)
@@ -298,6 +297,7 @@
connected = C
break
connected.connected = src
update_icon()
/obj/machinery/body_scanconsole/attack_ai(var/mob/user)
return attack_hand(user)
@@ -744,4 +744,4 @@
dat += text("<font color='red'>Cataracts detected.</font><BR>")
if(occ["sdisabilities"] & NEARSIGHTED)
dat += text("<font color='red'>Retinal misalignment detected.</font><BR>")
return dat
return dat
+5 -2
View File
@@ -8,11 +8,12 @@
idle_power_usage = 300
active_power_usage = 300
clicksound = "keyboard"
var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled.
var/processing = 0
var/icon_screen = "generic"
var/icon_scanline
var/light_range_on = 2
var/light_power_on = 1
var/overlay_layer
@@ -66,7 +67,7 @@
icon_state = initial(icon_state)
if(stat & BROKEN)
icon_state = "computer-broken"
icon_state = "[initial(icon_state)]-broken"
if (overlay_layer != layer)
add_overlay(image(icon, "broken", overlay_layer))
else
@@ -74,6 +75,8 @@
else if (icon_screen)
if (is_holographic)
holographic_overlay(src, src.icon, icon_screen)
if (icon_scanline)
add_overlay(icon_scanline)
else if (overlay_layer != layer)
add_overlay(image(icon, icon_screen, overlay_layer))
else
+3 -3
View File
@@ -52,11 +52,11 @@
/obj/machinery/computer/guestpass
name = "guest pass terminal"
desc = "Allows issuing temporary access to an area."
icon_state = "guest"
icon_state = "guestw"
light_color = LIGHT_COLOR_BLUE
icon_screen = "pass"
is_holographic = FALSE
icon_screen = "guest"
icon_scanline = "altcomputerw-scanline"
density = 0
var/obj/item/card/id/giver
+11 -6
View File
@@ -14,12 +14,15 @@ var/global/list/frozen_crew = list()
/obj/machinery/computer/cryopod
name = "cryogenic oversight console"
desc = "An interface between crew and the cryogenic storage oversight systems."
icon = 'icons/obj/sleeper.dmi'
icon_state = "cellconsole"
light_color = LIGHT_COLOR_GREEN
icon_state = "altcomputerw"
circuit = /obj/item/circuitboard/cryopodcontrol
density = FALSE
interact_offline = TRUE
icon_screen = "cryo"
icon_scanline = "altcomputerw-scanline"
light_color = LIGHT_COLOR_GREEN
var/mode = null
var/list/frozen_items = list()
@@ -31,10 +34,12 @@ var/global/list/frozen_crew = list()
/obj/machinery/computer/cryopod/robot
name = "robotic storage console"
desc = "An interface between crew and the robotic storage systems"
icon = 'icons/obj/robot_storage.dmi'
icon_state = "console"
icon_state = "altcomputerw"
circuit = /obj/item/circuitboard/robotstoragecontrol
icon_screen = "cryo_robot"
light_color = LIGHT_COLOR_PURPLE
storage_type = "Cyborgs"
storage_name = "Robotic Storage Control"
allow_items = FALSE
@@ -612,4 +617,4 @@ var/global/list/frozen_crew = list()
src.occupant = occupant
name = initial(name)
if(occupant)
name = "[name] ([occupant])"
name = "[name] ([occupant])"
+9 -2
View File
@@ -512,10 +512,16 @@
/obj/machinery/chakraconsole/power_change()
..()
update_icon()
/obj/machinery/chakraconsole/update_icon()
cut_overlays()
if((stat & BROKEN) || (stat & NOPOWER))
icon_state = "sleeper_s_scannerconsole-p"
return
else
icon_state = initial(icon_state)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "sleeper_s_scannerconsole-screen", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_RED)
/obj/machinery/chakraconsole/Initialize()
. = ..()
@@ -524,6 +530,7 @@
break
if(connected)
connected.connected = src
update_icon()
/obj/machinery/chakraconsole/Destroy()
if (connected)
+42
View File
@@ -0,0 +1,42 @@
################################
# 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
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy)
# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Made scanner and cryopod screens light up."
- imageadd: "New icons for robot storage and cryo storage."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 91 KiB