mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +01:00
New terminal sprites (#8815)
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:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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:
|
||||
- imageadd: "New wall terminal sprites, i.e, newscaster, request console, ringer, production console, etc."
|
||||
- rscadd: "Newscasters print to your hands instead of down to the floor."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 17 KiB |
Reference in New Issue
Block a user