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

New terminal sprites (#8815)

Browse Source 
look at this sick scanline animation

also newspaper print to your hands i guess
holograms cool

also fixes like a frame of the id terminal that was bugging me
This commit is contained in:
Wowzewow (Wezzy)
2020-05-09 05:27:30 +08:00
committed by GitHub
parent 0907c95842
commit d9902fdad7
6 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/machinery/newscaster.dm
View File

@@ -84,6 +84,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
add_overlay(base_screen_overlay)
set_light(1.4, 1, COLOR_CYAN)
if(!alert || !SSnews.wanted_issue) // since we're transparent I don't want overlay nonsense
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-title", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
if(SSnews.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-wanted", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
@@ -93,6 +97,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-alert", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
if(hitstaken == 0)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "newscaster-scanline", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
if(hitstaken > 0) //Cosmetic damage overlay
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "crack[hitstaken]", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
@@ -978,7 +986,8 @@ obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob)
NEWSPAPER.news_content += FC
if(SSnews.wanted_issue)
NEWSPAPER.important_message = SSnews.wanted_issue
NEWSPAPER.forceMove(get_turf(src))
playsound(src.loc, 'sound/bureaucracy/print.ogg', 75, 1)
usr.put_in_hands(NEWSPAPER)
src.paper_remaining--
return

9
code/game/machinery/requests_console.dm
View File

@@ -90,11 +90,14 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if(2)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-redalert", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_RED_LIGHT)
set_light(1.4, 1, COLOR_ORANGE)
if(3)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-yellowalert", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_YELLOW)
set_light(1.4, 1, COLOR_ORANGE)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "req_comp-scanline", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
/obj/machinery/requests_console/Initialize(mapload, var/dir, var/building = 0)
. = ..()
@@ -464,4 +467,4 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announceAuth = 0
announcement.announcer = ""
if(mainmenu)
screen = RCS_MAINMENU
screen = RCS_MAINMENU

7
code/game/machinery/ringer.dm
View File

@@ -38,11 +38,13 @@
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-active", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_CYAN)
return
if(pinged)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-alert", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
set_light(1.4, 1, COLOR_RED_LIGHT)
set_light(1.4, 1, COLOR_CYAN)
if(on)
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-scanline", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
else
var/mutable_appearance/screen_overlay = mutable_appearance(icon, "bell-standby", EFFECTS_ABOVE_LIGHTING_LAYER)
add_overlay(screen_overlay)
@@ -94,6 +96,7 @@
return
pinged = TRUE
update_icon()
playsound(src.loc, 'sound/machines/ringer.ogg', 50, 1)