mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
[MIRROR] New sprites for requests, pod, and gulag wall consoles [MDB IGNORE] (#20406)
* New sprites for requests, pod, and gulag wall consoles (#74456) ## About The Pull Request Changes ancient sprites for requests _(don't confuse them with cargo requests computer)_ and pod wall consoles, to the new polished ones with the same style as the newscaster. Also makes the gulag/pod console actually use overlays, instead of having the screen melted into its icon (so now when it has no electricity it screen turns off). Now pods and gulag console's screen changes when they get emagged. Requests console:      Pod console:   Gulag item retrieval console:   Emagged gulag/pod console:  ## Why It's Good For The Game The old sprites of them are really ancient, have bad looks and that old isometric perspective.   Having new sprites is always great for people's eyes. This also will make the requests console more noticeable, that way _maybe_ people will start using it more often. Making them use overlays instead of having the screen icon merged into the base icon is good because it gives more dynamic, as when electricity turns out it signals more to the players that it's not functional right now. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog 🆑 DrDiasyl aka DrTuxedo#0931 imageadd: Requestions consoles got a new sprite! imageadd: Gulag consoles got a new sprite! imageadd: Escape and assault pod consoles got a new sprite! qol: Now the gulag and pods consoles use overlays, instead of having turned ON screen in their base icon. qol: Now the gulag and pods consoles screen change when they are emagged. qol: Requests console now shows examine prompt on how to open their panel. Also shows a prompt if they were hacked. /🆑 --------- Co-authored-by: san7890 <the@ san7890.com> * New sprites for requests, pod, and gulag wall consoles * update modular * overlays are a fuck * Update computer.dmi --------- Co-authored-by: DrTuxedo <42353186+DrDiasyl@users.noreply.github.com> Co-authored-by: san7890 <the@ san7890.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
co-authored by
san7890
DrTuxedo
Tom
Zonespace
Gandalf
san7890
DrTuxedo
Tom
Zonespace
Gandalf
parent
38f6c73d72
commit
1b8d0b3a2f
@@ -2,18 +2,28 @@
|
||||
name = "equipment reclaimer station"
|
||||
desc = "Used to reclaim your items after you finish your sentence at the labor camp."
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "dorm_taken"
|
||||
icon_state = "gulag_off"
|
||||
req_access = list(ACCESS_BRIG) //REQACCESS TO ACCESS ALL STORED ITEMS
|
||||
density = FALSE
|
||||
|
||||
var/list/stored_items = list()
|
||||
var/obj/machinery/gulag_teleporter/linked_teleporter = null
|
||||
///Icon of the current screen status
|
||||
var/screen_icon = "gulag_on"
|
||||
|
||||
/obj/machinery/gulag_item_reclaimer/handle_atom_del(atom/deleting_atom)
|
||||
for(var/person in stored_items)
|
||||
stored_items[person] -= deleting_atom
|
||||
return ..()
|
||||
|
||||
/obj/machinery/gulag_item_reclaimer/update_overlays()
|
||||
. = ..()
|
||||
if(machine_stat & (NOPOWER|BROKEN))
|
||||
return
|
||||
|
||||
. += mutable_appearance(icon, screen_icon)
|
||||
. += emissive_appearance(icon, screen_icon, src)
|
||||
|
||||
/obj/machinery/gulag_item_reclaimer/Destroy()
|
||||
for(var/i in contents)
|
||||
var/obj/item/I = i
|
||||
@@ -27,6 +37,8 @@
|
||||
return
|
||||
req_access = list()
|
||||
obj_flags |= EMAGGED
|
||||
screen_icon = "emagged_general"
|
||||
update_appearance()
|
||||
|
||||
/obj/machinery/gulag_item_reclaimer/ui_interact(mob/user, datum/tgui/ui)
|
||||
ui = SStgui.try_update_ui(user, src, ui)
|
||||
|
||||
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
|
||||
/obj/machinery/requests_console
|
||||
name = "requests console"
|
||||
desc = "A console intended to send requests to different departments on the station."
|
||||
icon = 'icons/obj/terminals.dmi' //OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "req_comp_off"
|
||||
base_icon_state = "req_comp"
|
||||
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.15
|
||||
@@ -108,16 +108,22 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
|
||||
return
|
||||
set_light(1.5, 0.7, "#34D352")//green light
|
||||
|
||||
/obj/machinery/requests_console/update_icon_state()
|
||||
if(open)
|
||||
icon_state = "[base_icon_state]_[hackState ? "rewired" : "open"]"
|
||||
return ..()
|
||||
icon_state = "[base_icon_state]_off"
|
||||
return ..()
|
||||
/obj/machinery/requests_console/examine(mob/user)
|
||||
. = ..()
|
||||
if(!open)
|
||||
. += span_notice("It looks like you can pry open the panel with <b>a crowbar</b>.")
|
||||
else
|
||||
. += span_warning("The panel was pried open, you can close it with <b>a crowbar</b>.")
|
||||
|
||||
if(hackState)
|
||||
. += span_warning("The console seems to have been tampered with!")
|
||||
|
||||
/obj/machinery/requests_console/update_overlays()
|
||||
. = ..()
|
||||
|
||||
if(open)
|
||||
. += mutable_appearance(icon, "req_comp_open")
|
||||
|
||||
if(open || (machine_stat & NOPOWER))
|
||||
return
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
desc = "Allows a deployable expedition base to be dropped from the station to a designated mining location. It can also \
|
||||
interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "dorm_available"
|
||||
icon_state = "pod_off"
|
||||
icon_keyboard = null
|
||||
icon_screen = null
|
||||
icon_screen = "pod_on"
|
||||
req_one_access = list(ACCESS_AUX_BASE, ACCESS_COMMAND)
|
||||
circuit = /obj/item/circuitboard/computer/auxiliary_base
|
||||
/// Shuttle ID of the base
|
||||
|
||||
@@ -598,13 +598,14 @@
|
||||
locked = TRUE
|
||||
possible_destinations = "pod_asteroid"
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "dorm_available"
|
||||
icon_state = "pod_off"
|
||||
circuit = /obj/item/circuitboard/computer/emergency_pod
|
||||
light_color = LIGHT_COLOR_BLUE
|
||||
density = FALSE
|
||||
icon_keyboard = null
|
||||
icon_screen = "pod_on"
|
||||
|
||||
/obj/machinery/computer/shuttle/pod/Initialize(mapload)
|
||||
AddElement(/datum/element/update_icon_blocker)
|
||||
. = ..()
|
||||
RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_lock))
|
||||
|
||||
@@ -614,6 +615,8 @@
|
||||
obj_flags |= EMAGGED
|
||||
locked = FALSE
|
||||
to_chat(user, span_warning("You fry the pod's alert level checking system."))
|
||||
icon_screen = "emagged_general"
|
||||
update_appearance()
|
||||
|
||||
/obj/machinery/computer/shuttle/pod/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
|
||||
. = ..()
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
name = "syndicate assault pod control"
|
||||
desc = "Controls the drop pod's launch system."
|
||||
icon = 'icons/obj/terminals.dmi'
|
||||
icon_state = "dorm_available"
|
||||
icon_state = "pod_off"
|
||||
icon_keyboard = null
|
||||
icon_screen = null
|
||||
icon_screen = "pod_on"
|
||||
light_color = LIGHT_COLOR_BLUE
|
||||
req_access = list(ACCESS_SYNDICATE)
|
||||
shuttleId = "steel_rain"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 10 KiB |
@@ -1,10 +1,18 @@
|
||||
/obj/machinery/computer/shuttle/pod/advanced
|
||||
icon = 'modular_skyrat/modules/advanced_shuttles/icons/computer.dmi'
|
||||
icon_state = "intercom"
|
||||
icon_screen = "null"
|
||||
layer = ABOVE_OBJ_LAYER
|
||||
|
||||
connectable = FALSE //connecting_computer change: since icon_state is not a typical console, it cannot be connectable.
|
||||
|
||||
/obj/machinery/computer/shuttle/pod/advanced/emag_act(mob/user)
|
||||
if(obj_flags & EMAGGED)
|
||||
return
|
||||
obj_flags |= EMAGGED
|
||||
locked = FALSE
|
||||
to_chat(user, span_warning("You fry the pod's alert level checking system."))
|
||||
|
||||
/obj/machinery/computer/emergency_shuttle/advanced
|
||||
icon = 'modular_skyrat/modules/advanced_shuttles/icons/computer.dmi'
|
||||
icon_state = "computer"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 27 KiB |
@@ -1,3 +0,0 @@
|
||||
/obj/machinery/requests_console
|
||||
icon = 'modular_skyrat/modules/aesthetics/requests/icons/requests.dmi'
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
@@ -5562,7 +5562,6 @@
|
||||
#include "modular_skyrat\modules\aesthetics\plasticflaps\code\plasticflaps.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\posters\posters.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\rack\code\rack.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\requests\code\requests_console.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\rollerbed\code\rollerbed.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\shieldgen\code\shieldgen.dm"
|
||||
#include "modular_skyrat\modules\aesthetics\spaceship_navigation_beacon\spaceship_navigation_beacon.dm"
|
||||
|
||||
Reference in New Issue
Block a user