mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 16:12:19 +00:00
Bar Map Tweaks and Audioconsole Variant (#14051)
This commit is contained in:
@@ -117,7 +117,7 @@ datum/track/New(var/title_name, var/audio)
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/media/jukebox/ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1)
|
||||
var/title = "RetroBox - Space Style"
|
||||
var/title = "Music Player"
|
||||
var/data[0]
|
||||
|
||||
if(!(stat & (NOPOWER|BROKEN)))
|
||||
@@ -233,7 +233,7 @@ datum/track/New(var/title_name, var/audio)
|
||||
|
||||
/obj/machinery/media/jukebox/audioconsole
|
||||
name = "audioconsole"
|
||||
desc = "An Idris-designed jukebox for the 25th century. Unfortunately, someone made a mistake setting this one up - it isn't connected to the extranet - and only plays the demo music it was preprogrammed with."
|
||||
desc = "An Idris-designed jukebox for the 25th century. Unfortunately, someone made a mistake setting this one up. It isn't connected to the extranet and only plays the demo music it was pre-programmed with."
|
||||
icon = 'icons/obj/audioconsole.dmi'
|
||||
icon_state = "audioconsole-nopower"
|
||||
state_base = "audioconsole"
|
||||
@@ -244,7 +244,7 @@ datum/track/New(var/title_name, var/audio)
|
||||
new/datum/track("Don't Rush", 'sound/music/audioconsole/DontRush.ogg'),
|
||||
new/datum/track("Phoron Will Make Us Rich", 'sound/music/audioconsole/PhoronWillMakeUsRich.ogg'),
|
||||
new/datum/track("Amsterdam", 'sound/music/audioconsole/Amsterdam.ogg'),
|
||||
new/datum/track("when", 'sound/music/audioconsole/When.ogg'),
|
||||
new/datum/track("When", 'sound/music/audioconsole/When.ogg'),
|
||||
new/datum/track("Number 0", 'sound/music/audioconsole/Number0.ogg'),
|
||||
new/datum/track("The Pianist", 'sound/music/audioconsole/ThePianist.ogg'),
|
||||
new/datum/track("Lips", 'sound/music/audioconsole/Lips.ogg'),
|
||||
@@ -255,4 +255,9 @@ datum/track/New(var/title_name, var/audio)
|
||||
cut_overlays()
|
||||
icon_state = state_base
|
||||
if(playing)
|
||||
add_overlay("[state_base]-running")
|
||||
add_overlay("[state_base]-running")
|
||||
|
||||
/obj/machinery/media/jukebox/audioconsole/wall
|
||||
icon = 'icons/obj/audioconsole_wall.dmi'
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
@@ -2,6 +2,7 @@
|
||||
name = "station intercom (General)"
|
||||
desc = "Talk through this."
|
||||
icon_state = "intercom"
|
||||
layer = 2.99
|
||||
anchored = TRUE
|
||||
appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall
|
||||
w_class = ITEMSIZE_LARGE
|
||||
|
||||
@@ -52,9 +52,10 @@
|
||||
/obj/structure/sign/double/barsign
|
||||
icon = 'icons/obj/barsigns.dmi'
|
||||
icon_state = "Off"
|
||||
anchored = 1
|
||||
var/cult = 0
|
||||
layer = 2.99
|
||||
anchored = TRUE
|
||||
req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access
|
||||
var/cult = 0
|
||||
var/choice_types = /decl/sign/double/bar
|
||||
|
||||
/obj/structure/sign/double/barsign/kitchensign
|
||||
|
||||
@@ -314,7 +314,7 @@
|
||||
name = "All-In-One Grinder"
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
icon_state = "juicer1"
|
||||
layer = 2.9
|
||||
layer = 2.99
|
||||
density = 0
|
||||
anchored = 0
|
||||
use_power = POWER_USE_IDLE
|
||||
|
||||
Reference in New Issue
Block a user