Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions _maps/map_files/AsteroidStation/AsteroidStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -33904,7 +33904,7 @@
"kns" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/item/latexballon,
/obj/item/latexballoon,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"knA" = (
Expand Down Expand Up @@ -59506,7 +59506,7 @@
"sCb" = (
/obj/structure/rack,
/obj/item/storage/box/lights/mixed,
/obj/item/latexballon,
/obj/item/latexballoon,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port)
Expand Down Expand Up @@ -66056,7 +66056,7 @@
/area/engine/engineering)
"uMm" = (
/obj/structure/rack,
/obj/item/latexballon,
/obj/item/latexballoon,
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/port/fore)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/YogStation/YogStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26127,7 +26127,7 @@
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/storage/box/lights/mixed,
/obj/item/latexballon,
/obj/item/latexballoon,
/turf/open/floor/plating,
/area/maintenance/port)
"gCF" = (
Expand Down Expand Up @@ -61070,7 +61070,7 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
/obj/item/latexballon,
/obj/item/latexballoon,
/obj/structure/disposalpipe/segment{
dir = 4
},
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#define COMSIG_ATOM_NO_UPDATE_ICON_STATE UPDATE_ICON_STATE
/// If returned from [COMSIG_ATOM_UPDATE_ICON] it prevents the atom from updating its overlays.
#define COMSIG_ATOM_NO_UPDATE_OVERLAYS UPDATE_OVERLAYS
///from base of [atom/update_inhand_icon]: (/mob)
#define COMSIG_ATOM_UPDATE_INHAND_ICON "atom_update_inhand_icon"
///from base of [atom/update_icon_state]: ()
#define COMSIG_ATOM_UPDATE_ICON_STATE "atom_update_icon_state"
///from base of [/atom/update_overlays]: (list/new_overlays)
Expand Down
16 changes: 16 additions & 0 deletions code/__DEFINES/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
/// Blocks ruins spawning on the turf
#define NO_RUINS_1 (1<<10)

// Update flags for [/atom/proc/update_appearance]
/// Update the atom's name
#define UPDATE_NAME (1<<0)
/// Update the atom's desc
#define UPDATE_DESC (1<<1)
/// Update the atom's icon state
#define UPDATE_ICON_STATE (1<<2)
/// Update the atom's overlays
#define UPDATE_OVERLAYS (1<<3)
/// Update the atom's greyscaling
#define UPDATE_GREYSCALE (1<<4)
/// Update the atom's smoothing. (More accurately, queue it for an update)
#define UPDATE_SMOOTHING (1<<5)
/// Update the atom's icon
#define UPDATE_ICON (UPDATE_ICON_STATE|UPDATE_OVERLAYS)

//AREA FLAGS
/// If blobs can spawn there and if it counts towards their score.
#define BLOBS_ALLOWED (1<<1)
Expand Down
3 changes: 3 additions & 0 deletions code/_globalvars/lists/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ GLOBAL_LIST_EMPTY(ai_core_displays)
GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
GLOBAL_LIST_INIT(alarms, list("Fire" = list(), "Atmosphere" = list(), "Power" = list())) //all engineering alerts for station alert consoles and alarm manager

GLOBAL_LIST_EMPTY(roundstart_station_borgcharger_areas) // List of area names of roundstart station cyborg rechargers, for the low charge/no charge cyborg screen alert tooltips.
GLOBAL_LIST_EMPTY(roundstart_station_mechcharger_areas) // List of area names of roundstart station mech rechargers, for the low charge/no charge mech screen alert tooltips.
2 changes: 1 addition & 1 deletion code/_onclick/click.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@

if(W == A)
W.attack_self(src)
update_inv_hands()
update_held_items()
return

//These are always reachable.
Expand Down
7 changes: 4 additions & 3 deletions code/_onclick/hud/action_button.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,14 @@

/atom/movable/screen/button_palette/Initialize(mapload)
. = ..()
update_icon()
update_appearance()

/atom/movable/screen/button_palette/proc/set_hud(datum/hud/our_hud)
src.our_hud = our_hud
refresh_owner()

/atom/movable/screen/button_palette/proc/update_name(updates)
/atom/movable/screen/button_palette/update_name(updates)
. = ..()
if(expanded)
name = "Hide Buttons"
else
Expand Down Expand Up @@ -357,7 +358,7 @@ GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6,

expanded = new_expanded
our_group.refresh_actions()
update_icon()
update_appearance()

if(!usr.client)
return
Expand Down
36 changes: 18 additions & 18 deletions code/_onclick/hud/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,20 +192,20 @@
var/widescreen = owner?.client?.prefs?.read_preference(/datum/preference/toggle/widescreen)

// Language menu
using = new /atom/movable/screen/language_menu
using = new /atom/movable/screen/language_menu(src)
if(widescreen)
using.screen_loc = ui_ai_language_menu_widescreen
else
using.screen_loc = ui_ai_language_menu
static_inventory += using

//AI core
using = new /atom/movable/screen/ai/aicore()
using = new /atom/movable/screen/ai/aicore(src)
using.screen_loc = ui_ai_core
static_inventory += using

//Dashboard
using = new /atom/movable/screen/ai/dashboard
using = new /atom/movable/screen/ai/dashboard(src)
if(widescreen)
using.screen_loc = ui_ai_dashboard_widescreen
else
Expand All @@ -214,80 +214,80 @@
static_inventory += using

//Camera list
using = new /atom/movable/screen/ai/camera_list()
using = new /atom/movable/screen/ai/camera_list(src)
using.screen_loc = ui_ai_camera_list
static_inventory += using

//Track
using = new /atom/movable/screen/ai/camera_track()
using = new /atom/movable/screen/ai/camera_track(src)
using.screen_loc = ui_ai_track_with_camera
static_inventory += using

//Camera light
using = new /atom/movable/screen/ai/camera_light()
using = new /atom/movable/screen/ai/camera_light(src)
using.screen_loc = ui_ai_camera_light
static_inventory += using

//Crew Monitoring
using = new /atom/movable/screen/ai/crew_monitor()
using = new /atom/movable/screen/ai/crew_monitor(src)
using.screen_loc = ui_ai_crew_monitor
static_inventory += using

//Crew Manifest
using = new /atom/movable/screen/ai/crew_manifest()
using = new /atom/movable/screen/ai/crew_manifest(src)
using.screen_loc = ui_ai_crew_manifest
static_inventory += using

//Alerts
using = new /atom/movable/screen/ai/alerts()
using = new /atom/movable/screen/ai/alerts(src)
using.screen_loc = ui_ai_alerts
static_inventory += using

//Announcement
using = new /atom/movable/screen/ai/announcement()
using = new /atom/movable/screen/ai/announcement(src)
using.screen_loc = ui_ai_announcement
static_inventory += using

//Shuttle
using = new /atom/movable/screen/ai/call_shuttle()
using = new /atom/movable/screen/ai/call_shuttle(src)
using.screen_loc = ui_ai_shuttle
static_inventory += using

//Laws
using = new /atom/movable/screen/ai/state_laws()
using = new /atom/movable/screen/ai/state_laws(src)
using.screen_loc = ui_ai_state_laws
static_inventory += using

//Integrated Tablet
using = new /atom/movable/screen/ai/mod_pc()
using = new /atom/movable/screen/ai/mod_pc(src)
using.screen_loc = ui_ai_pda_send
static_inventory += using

//Take image
using = new /atom/movable/screen/ai/image_take()
using = new /atom/movable/screen/ai/image_take(src)
using.screen_loc = ui_ai_take_picture
static_inventory += using

//View images
using = new /atom/movable/screen/ai/image_view()
using = new /atom/movable/screen/ai/image_view(src)
using.screen_loc = ui_ai_view_images
static_inventory += using

//Medical/Security sensors
using = new /atom/movable/screen/ai/sensors()
using = new /atom/movable/screen/ai/sensors(src)
using.screen_loc = ui_ai_sensor
static_inventory += using

//Multicamera mode
using = new /atom/movable/screen/ai/multicam()
using = new /atom/movable/screen/ai/multicam(src)
if(widescreen)
using.screen_loc = ui_ai_multicam_widescreen
else
using.screen_loc = ui_ai_multicam
static_inventory += using

//Add multicamera camera
using = new /atom/movable/screen/ai/add_multicam()
using = new /atom/movable/screen/ai/add_multicam(src)
if(widescreen)
using.screen_loc = ui_ai_add_multicam_widescreen
else
Expand Down
39 changes: 36 additions & 3 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -530,15 +530,48 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."

/atom/movable/screen/alert/emptycell
name = "Out of Power"
desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \
Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged."
icon_state = "emptycell"

/atom/movable/screen/alert/emptycell/Initialize(mapload)
. = ..()
update_appearance(updates=UPDATE_DESC)

/atom/movable/screen/alert/emptycell/update_desc()
. = ..()
desc = initial(desc)
if(length(GLOB.roundstart_station_borgcharger_areas))
desc += " Recharging stations are available in [english_list(GLOB.roundstart_station_borgcharger_areas)]."

/atom/movable/screen/alert/lowcell
name = "Low Charge"
desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
desc = "Unit's power cell is running low."
icon_state = "lowcell"

/atom/movable/screen/alert/lowcell/Initialize(mapload)
. = ..()
update_appearance(updates=UPDATE_DESC)

/atom/movable/screen/alert/lowcell/update_desc()
. = ..()
desc = initial(desc)
if(length(GLOB.roundstart_station_borgcharger_areas))
desc += " Recharging stations are available in [english_list(GLOB.roundstart_station_borgcharger_areas)]."

//MECH

/atom/movable/screen/alert/lowcell/mech/update_desc()
. = ..()
desc = initial(desc)
if(length(GLOB.roundstart_station_mechcharger_areas))
desc += " Power ports are available in [english_list(GLOB.roundstart_station_mechcharger_areas)]."

/atom/movable/screen/alert/emptycell/mech/update_desc()
. = ..()
desc = initial(desc)
if(length(GLOB.roundstart_station_mechcharger_areas))
desc += " Power ports are available in [english_list(GLOB.roundstart_station_mechcharger_areas)]."

//Ethereal

/atom/movable/screen/alert/etherealcharge
Expand Down
30 changes: 15 additions & 15 deletions code/_onclick/hud/alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,75 +39,75 @@

//begin buttons

using = new /atom/movable/screen/swap_hand()
using = new /atom/movable/screen/swap_hand(src)
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
static_inventory += using

using = new /atom/movable/screen/swap_hand()
using = new /atom/movable/screen/swap_hand(src)
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
static_inventory += using

using = new /atom/movable/screen/act_intent/alien()
using = new /atom/movable/screen/act_intent/alien(src)
using.icon_state = mymob.a_intent
static_inventory += using
action_intent = using

if(isalienhunter(mymob))
var/mob/living/carbon/alien/humanoid/hunter/H = mymob
H.leap_icon = new /atom/movable/screen/alien/leap()
H.leap_icon = new /atom/movable/screen/alien/leap(src)
H.leap_icon.screen_loc = ui_alien_storage_r
static_inventory += H.leap_icon

using = new/atom/movable/screen/language_menu
using.screen_loc = ui_alien_language_menu
static_inventory += using

using = new /atom/movable/screen/drop()
using = new /atom/movable/screen/drop(src)
using.icon = ui_style
using.screen_loc = ui_drop_throw
static_inventory += using

using = new /atom/movable/screen/resist()
using = new /atom/movable/screen/resist(src)
using.icon = ui_style
using.screen_loc = ui_above_movement
hotkeybuttons += using

throw_icon = new /atom/movable/screen/throw_catch()
throw_icon = new /atom/movable/screen/throw_catch(src)
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
hotkeybuttons += throw_icon

pull_icon = new /atom/movable/screen/pull()
pull_icon = new /atom/movable/screen/pull(src)
pull_icon.icon = ui_style
pull_icon.update_icon(mymob)
pull_icon.update_appearance(UPDATE_ICON)
pull_icon.screen_loc = ui_above_movement
static_inventory += pull_icon

//begin indicators

healths = new /atom/movable/screen/healths/alien()
healths = new /atom/movable/screen/healths/alien(src)
infodisplay += healths

alien_plasma_display = new /atom/movable/screen/alien/plasma_display()
alien_plasma_display = new /atom/movable/screen/alien/plasma_display(src)
infodisplay += alien_plasma_display

if(!isalienqueen(mymob))
alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder
alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder(src)
infodisplay += alien_queen_finder

zone_select = new /atom/movable/screen/zone_sel/alien()
zone_select.update_icon(mymob)
zone_select = new /atom/movable/screen/zone_sel/alien(src)
zone_select.update_appearance(UPDATE_ICON)
static_inventory += zone_select

for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
inv.update_icon()
inv.update_appearance(UPDATE_ICON)

/datum/hud/alien/persistent_inventory_update()
if(!mymob)
Expand Down
Loading