From 56d972eb0b7aaca5b12c084c84cd967ee5195979 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 9 Feb 2025 02:09:28 -0300 Subject: [PATCH] all sorts of fixes and updates, may break stuff --- .vscode/settings.json | 2 +- .../signals_atom/signals_atom_mouse.dm | 2 + code/__DEFINES/dcs/signals/signals_global.dm | 3 + code/__DEFINES/dcs/signals/signals_hud.dm | 2 + code/__DEFINES/language.dm | 23 +- code/__HELPERS/_lists.dm | 7 + code/_onclick/hud/ai.dm | 54 ++-- code/_onclick/hud/alert.dm | 70 ++++-- code/_onclick/hud/alien.dm | 39 +-- code/_onclick/hud/alien_larva.dm | 18 +- code/_onclick/hud/blob_overmind.dm | 33 +-- code/_onclick/hud/blobbernauthud.dm | 6 +- code/_onclick/hud/clockwork_marauder.dm | 6 +- code/_onclick/hud/constructs.dm | 6 +- code/_onclick/hud/devil.dm | 21 +- code/_onclick/hud/drones.dm | 5 +- code/_onclick/hud/families.dm | 3 - code/_onclick/hud/generic_dextrous.dm | 24 +- code/_onclick/hud/ghost.dm | 18 +- code/_onclick/hud/guardian.dm | 34 ++- code/_onclick/hud/hud.dm | 7 +- code/_onclick/hud/human.dm | 123 ++++------ code/_onclick/hud/lavaland_elite.dm | 6 +- code/_onclick/hud/monkey.dm | 48 ++-- code/_onclick/hud/new_player.dm | 199 +++++++++++++-- code/_onclick/hud/plane_master_controller.dm | 5 +- code/_onclick/hud/radial_persistent.dm | 4 +- code/_onclick/hud/revenanthud.dm | 3 +- code/_onclick/hud/robot.dm | 58 ++--- code/_onclick/hud/screen_objects.dm | 53 +++- code/_onclick/hud/simple_animal.dm | 7 +- code/_onclick/hud/swarmer.dm | 18 +- .../subsystem/processing/station.dm | 9 + code/controllers/subsystem/ticker.dm | 4 +- code/controllers/subsystem/title.dm | 2 +- code/datums/action.dm | 14 -- code/datums/brain_damage/severe.dm | 8 +- code/datums/components/combat_mode.dm | 3 +- code/datums/components/crafting/crafting.dm | 4 +- code/datums/components/mood.dm | 4 +- .../diseases/advance/symptoms/voice_change.dm | 2 +- code/datums/dna.dm | 4 +- code/datums/mind.dm | 23 +- code/datums/mutations/speech.dm | 4 +- code/datums/station_traits/_station_trait.dm | 64 ++++- code/datums/station_traits/negative_traits.dm | 4 +- code/datums/status_effects/debuffs.dm | 14 +- code/datums/status_effects/wound_effects.dm | 3 + code/datums/world_topic.dm | 2 +- code/game/atoms_movable.dm | 66 +++-- code/game/objects/buckling.dm | 2 +- code/game/objects/effects/landmarks.dm | 50 ++-- code/game/objects/items/devices/flashlight.dm | 4 +- code/game/objects/items/documents.dm | 4 +- code/game/objects/items/holy_weapons.dm | 1 - code/game/objects/structures/fireplace.dm | 4 +- .../objects/structures/ghost_role_spawners.dm | 2 +- .../objects/structures/industrial_lift.dm | 5 +- code/game/objects/structures/mirror.dm | 12 +- .../structures/transit_tubes/transit_tube.dm | 4 +- code/game/sound.dm | 4 + code/modules/admin/topic.dm | 3 +- code/modules/admin/verbs/adminhelp.dm | 4 +- .../abductor/equipment/glands/slime.dm | 4 +- .../bloodsucker/datum_bloodsucker.dm | 2 +- .../antagonists/bloodsucker/datum_vassal.dm | 2 +- .../antagonists/changeling/changeling.dm | 2 +- .../antagonists/clockcult/clockcult.dm | 2 +- code/modules/antagonists/cult/cult.dm | 4 +- code/modules/antagonists/ert/ert.dm | 3 +- code/modules/antagonists/gang/gang.dm | 3 +- .../modules/antagonists/traitor/classes/ai.dm | 2 +- .../antagonists/wizard/equipment/artefact.dm | 4 +- .../antagonists/wizard/equipment/soulstone.dm | 4 +- .../modules/atmospherics/gasmixtures/auxgm.dm | 2 +- code/modules/client/client_procs.dm | 9 + code/modules/client/preferences.dm | 2 +- code/modules/events/sentience.dm | 2 +- code/modules/jobs/job_types/curator.dm | 3 +- code/modules/language/codespeak.dm | 4 +- code/modules/language/language_holder.dm | 230 ++++++++++-------- code/modules/language/language_menu.dm | 119 +++++---- .../mining/lavaland/necropolis_chests.dm | 1 + code/modules/mob/dead/dead.dm | 12 +- code/modules/mob/dead/new_player/login.dm | 4 - .../modules/mob/dead/new_player/new_player.dm | 4 +- .../mob/living/carbon/human/human_defines.dm | 1 + .../mob/living/carbon/human/species.dm | 16 +- .../mob/living/carbon/human/status_procs.dm | 6 +- code/modules/mob/living/say.dm | 5 - code/modules/mob/living/silicon/pai/pai.dm | 2 - .../mob/living/silicon/pai/software.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- code/modules/mob/mob.dm | 5 +- code/modules/mob/transform_procs.dm | 1 - .../crossbreeding/_status_effects.dm | 1 - .../ruins/spaceruin_code/TheDerelict.dm | 4 +- code/modules/tgui/states/language_menu.dm | 4 +- code/modules/unit_tests/_unit_tests.dm | 1 + code/modules/unit_tests/language_transfer.dm | 191 +++++++++++++++ icons/hud/lobby/background.dmi | Bin 558 -> 565 bytes icons/hud/lobby/collapse_expand.dmi | Bin 919 -> 854 bytes icons/hud/lobby/signup_button.dmi | Bin 0 -> 2723 bytes icons/hud/lobby/start_now.dmi | Bin 0 -> 11181 bytes sound/misc/menu/attribution.txt | 6 + sound/misc/menu/menu_rolldown1.ogg | Bin 0 -> 16980 bytes sound/misc/menu/menu_rollup1.ogg | Bin 0 -> 17736 bytes sound/misc/menu/ui_select1.ogg | Bin 0 -> 8355 bytes 108 files changed, 1157 insertions(+), 758 deletions(-) create mode 100644 code/modules/unit_tests/language_transfer.dm create mode 100644 icons/hud/lobby/signup_button.dmi create mode 100644 icons/hud/lobby/start_now.dmi create mode 100644 sound/misc/menu/attribution.txt create mode 100644 sound/misc/menu/menu_rolldown1.ogg create mode 100644 sound/misc/menu/menu_rollup1.ogg create mode 100644 sound/misc/menu/ui_select1.ogg diff --git a/.vscode/settings.json b/.vscode/settings.json index 8edb013566..a11bf93e5c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,7 @@ "**/.pnp.*": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "workbench.editorAssociations": { "*.dmi": "dmiEditor.dmiEditor" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm index 2b0c9c297e..381367fd92 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm @@ -23,3 +23,5 @@ #define COMPONENT_NO_MOUSEDROP (1<<0) ///from base of atom/MouseDrop_T: (/atom/from, /mob/user) #define COMSIG_MOUSEDROPPED_ONTO "mousedropped_onto" //from base of atom/MouseDrop_T: (/atom/from, /mob/user) +/// From /atom/movable/screen/click(): (atom/target, atom/location, control, params, mob/user) +#define COMSIG_SCREEN_ELEMENT_CLICK "screen_element_click" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 3e0e1d2296..eeb71f90f1 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -1,2 +1,5 @@ /// a person somewhere has thrown something : (mob/living/carbon/carbon_thrower, target) #define COMSIG_GLOB_CARBON_THROW_THING "!throw_thing" + +/// Global signal sent before we decide what job everyone has +#define COMSIG_GLOB_PRE_JOBS_ASSIGNED "!pre_roles_assigned" diff --git a/code/__DEFINES/dcs/signals/signals_hud.dm b/code/__DEFINES/dcs/signals/signals_hud.dm index c771204773..63a55f95ca 100644 --- a/code/__DEFINES/dcs/signals/signals_hud.dm +++ b/code/__DEFINES/dcs/signals/signals_hud.dm @@ -2,3 +2,5 @@ #define COMSIG_HUD_LOBBY_COLLAPSED "hud_lobby_collapsed" /// Sent from /atom/movable/screen/lobby/button/collapse/proc/expand_buttons() : () #define COMSIG_HUD_LOBBY_EXPANDED "hud_lobby_expanded" +/// Sent from /atom/movable/screen/lobby/button/ready/Click() : () +#define COMSIG_HUD_PLAYER_READY_TOGGLE "hud_player_ready_toggle" diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index 798ea478c2..91f9f8572b 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -4,10 +4,21 @@ #define LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD 8 // LANGUAGE SOURCE DEFINES -#define LANGUAGE_ALL "all" // For use in full removal only. -#define LANGUAGE_ATOM "atom" -#define LANGUAGE_MIND "mind" +/// For use in full removal only. +#define LANGUAGE_ALL "all" +// Generic language sources. +/// Language is linked to the movable directly. +#define LANGUAGE_ATOM "atom" +/// Language is linked to the mob's mind. +/// If a mind transfer happens, language follows. +#define LANGUAGE_MIND "mind" +/// Language is linked to the mob's species. +/// If a species change happens, language goes away. +/// If applied to a non-human (no species) atom, this is effectively the same as [LANGUAGE_ATOM]. +#define LANGUAGE_SPECIES "species" +// More specific language sources. +// Only ever goes away when dismissed directly. #define LANGUAGE_ABSORB "absorb" #define LANGUAGE_APHASIA "aphasia" #define LANGUAGE_BLOODSUCKER "bloodsucker" @@ -25,3 +36,9 @@ #define LANGUAGE_VASSAL "vassal" #define LANGUAGE_VOICECHANGE "voicechange" #define LANGUAGE_MULTILINGUAL "multilingual" + +// Language flags. Used in granting and removing languages. +/// This language can be spoken. +#define SPOKEN_LANGUAGE (1<<0) +/// This language can be understood. +#define UNDERSTOOD_LANGUAGE (1<<1) diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 3b092fd3b7..a8373205ca 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -743,6 +743,13 @@ else L1[key] = other_value +/// Turns an associative list into a flat list of keys +/proc/assoc_to_keys(list/input) + var/list/keys = list() + for(var/key in input) + UNTYPED_LIST_ADD(keys, key) + return keys + /proc/assoc_list_strip_value(list/input) var/list/ret = list() for(var/key in input) diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index d4344b9464..b264de2cd9 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -194,109 +194,91 @@ var/atom/movable/screen/using // Language menu - using = new /atom/movable/screen/language_menu + using = new /atom/movable/screen/language_menu(null, src) using.screen_loc = ui_ai_language_menu - using.hud = src static_inventory += using //AI core - using = new /atom/movable/screen/ai/aicore() + using = new /atom/movable/screen/ai/aicore(null, src) using.screen_loc = ui_ai_core - using.hud = src static_inventory += using //Camera list - using = new /atom/movable/screen/ai/camera_list() + using = new /atom/movable/screen/ai/camera_list(null, src) using.screen_loc = ui_ai_camera_list - using.hud = src static_inventory += using //Track - using = new /atom/movable/screen/ai/camera_track() + using = new /atom/movable/screen/ai/camera_track(null, src) using.screen_loc = ui_ai_track_with_camera - using.hud = src static_inventory += using //Camera light - using = new /atom/movable/screen/ai/camera_light() + using = new /atom/movable/screen/ai/camera_light(null, src) using.screen_loc = ui_ai_camera_light - using.hud = src static_inventory += using //Crew Monitoring - using = new /atom/movable/screen/ai/crew_monitor() + using = new /atom/movable/screen/ai/crew_monitor(null, src) using.screen_loc = ui_ai_crew_monitor - using.hud = src static_inventory += using //Crew Manifest - using = new /atom/movable/screen/ai/crew_manifest() + using = new /atom/movable/screen/ai/crew_manifest(null, src) using.screen_loc = ui_ai_crew_manifest - using.hud = src static_inventory += using //Alerts - using = new /atom/movable/screen/ai/alerts() + using = new /atom/movable/screen/ai/alerts(null, src) using.screen_loc = ui_ai_alerts - using.hud = src static_inventory += using //Announcement - using = new /atom/movable/screen/ai/announcement() + using = new /atom/movable/screen/ai/announcement(null, src) using.screen_loc = ui_ai_announcement - using.hud = src static_inventory += using //Shuttle - using = new /atom/movable/screen/ai/call_shuttle() + using = new /atom/movable/screen/ai/call_shuttle(null, src) using.screen_loc = ui_ai_shuttle - using.hud = src static_inventory += using //Laws - using = new /atom/movable/screen/ai/state_laws() + using = new /atom/movable/screen/ai/state_laws(null, src) using.screen_loc = ui_ai_state_laws - using.hud = src static_inventory += using //PDA message - using = new /atom/movable/screen/ai/pda_msg_send() + using = new /atom/movable/screen/ai/pda_msg_send(null, src) using.screen_loc = ui_ai_pda_send - using.hud = src static_inventory += using //PDA log - using = new /atom/movable/screen/ai/pda_msg_show() + using = new /atom/movable/screen/ai/pda_msg_show(null, src) using.screen_loc = ui_ai_pda_log - using.hud = src static_inventory += using //Take image - using = new /atom/movable/screen/ai/image_take() + using = new /atom/movable/screen/ai/image_take(null, src) using.screen_loc = ui_ai_take_picture - using.hud = src static_inventory += using //View images - using = new /atom/movable/screen/ai/image_view() + using = new /atom/movable/screen/ai/image_view(null, src) using.screen_loc = ui_ai_view_images - using.hud = src static_inventory += using //Medical/Security sensors - using = new /atom/movable/screen/ai/sensors() + using = new /atom/movable/screen/ai/sensors(null, src) using.screen_loc = ui_ai_sensor - using.hud = src static_inventory += using //Multicamera mode - using = new /atom/movable/screen/ai/multicam() + using = new /atom/movable/screen/ai/multicam(null, src) using.screen_loc = ui_ai_multicam - using.hud = src static_inventory += using //Add multicamera camera - using = new /atom/movable/screen/ai/add_multicam() + using = new /atom/movable/screen/ai/add_multicam(null, src) using.screen_loc = ui_ai_add_multicam - using.hud = src static_inventory += using diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 815e46f9eb..4475d2a117 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -259,10 +259,10 @@ or something covering your eyes." var/command /atom/movable/screen/alert/mind_control/Click() - var/mob/living/L = usr - if(L != owner) + . = ..() + if(!.) return - to_chat(L, "[command]") + to_chat(usr, "[command]") /atom/movable/screen/alert/hypnosis name = "Hypnosis" @@ -283,9 +283,13 @@ If you're feeling frisky, examine yourself and click the underlined item to pull clickable_glow = TRUE /atom/movable/screen/alert/embeddedobject/Click() - if(isliving(usr) && usr == owner) - var/mob/living/carbon/M = usr - return M.help_shake_act(M) + . = ..() + if(!.) + return + if(!isliving(usr)) + return + var/mob/living/carbon/M = usr + return M.help_shake_act(M) /atom/movable/screen/alert/weightless name = "Weightless" @@ -312,8 +316,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." clickable_glow = TRUE /atom/movable/screen/alert/fire/Click() + . = ..() + if(!.) + return var/mob/living/L = usr - if(!istype(L) || !L.can_resist() || L != owner) + if(!istype(L) || !L.can_resist()) return L.MarkResistTime() if(CHECK_MOBILITY(L, MOBILITY_MOVE)) @@ -721,14 +728,16 @@ so as to remain in compliance with the most up-to-date laws." var/atom/target = null /atom/movable/screen/alert/hackingapc/Click() - if(!usr || !usr.client || usr != owner) + . = ..() + if(!.) return if(!target) return var/mob/living/silicon/ai/AI = usr var/turf/T = get_turf(target) - if(T) - AI.eyeobj.setLoc(T) + if(!T) + return + AI.eyeobj.setLoc(T) //MECHS @@ -748,10 +757,11 @@ so as to remain in compliance with the most up-to-date laws." clickable_glow = TRUE /atom/movable/screen/alert/notify_cloning/Click() - if(!usr || !usr.client || usr != owner) + . = ..() + if(!.) return - var/mob/dead/observer/G = usr - G.reenter_corpse() + var/mob/dead/observer/dead_owner = usr + dead_owner.reenter_corpse() /atom/movable/screen/alert/notify_action name = "Body created" @@ -763,8 +773,10 @@ so as to remain in compliance with the most up-to-date laws." var/action = NOTIFY_JUMP /atom/movable/screen/alert/notify_action/Click() - if(!usr || !usr.client || usr != owner) + . = ..() + if(!.) return + if(!target) return var/mob/dead/observer/G = usr @@ -782,32 +794,43 @@ so as to remain in compliance with the most up-to-date laws." //OBJECT-BASED -/atom/movable/screen/alert/restrained - clickable_glow = TRUE - -/atom/movable/screen/alert/restrained/buckled +/atom/movable/screen/alert/buckled name = "Buckled" desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." icon_state = "buckled" + clickable_glow = TRUE + +/atom/movable/screen/alert/restrained + clickable_glow = TRUE /atom/movable/screen/alert/restrained/handcuffed name = "Handcuffed" desc = "You're handcuffed and can't act. If anyone drags you, you won't be able to move. Click the alert to free yourself." + click_master = FALSE /atom/movable/screen/alert/restrained/legcuffed name = "Legcuffed" desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself." + click_master = FALSE /atom/movable/screen/alert/restrained/Click() + . = ..() + if(!.) + return + var/mob/living/L = usr - if(!istype(L) || !L.can_resist() || L != owner) + if(!istype(L) || !L.can_resist()) return L.MarkResistTime() return L.resist_restraints() -/atom/movable/screen/alert/restrained/buckled/Click() +/atom/movable/screen/alert/buckled/Click() + . = ..() + if(!.) + return + var/mob/living/L = usr - if(!istype(L) || !L.can_resist() || L != owner) + if(!istype(L) || !L.can_resist()) return L.MarkResistTime() return L.resist_buckle() @@ -824,8 +847,11 @@ so as to remain in compliance with the most up-to-date laws." clickable_glow = TRUE /atom/movable/screen/alert/shoes/Click() + . = ..() + if(!.) + return var/mob/living/carbon/C = usr - if(!istype(C) || !C.can_resist() || C != owner || !C.shoes) + if(!istype(C) || !C.can_resist() || !C.shoes) return C.MarkResistTime() C.shoes.handle_tying(C) diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 8a494a05b9..49d0087a7d 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -39,84 +39,71 @@ //begin buttons - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_1" using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src static_inventory += using - action_intent = new /atom/movable/screen/act_intent/alien() + action_intent = new /atom/movable/screen/act_intent/alien(null, src) action_intent.icon_state = mymob.a_intent - action_intent.hud = src static_inventory += action_intent 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(null, src) H.leap_icon.screen_loc = ui_alien_storage_r static_inventory += H.leap_icon - using = new/atom/movable/screen/language_menu + using = new/atom/movable/screen/language_menu(null, src) using.screen_loc = ui_alien_language_menu - using.hud = src static_inventory += using - using = new /atom/movable/screen/drop() + using = new /atom/movable/screen/drop(null, src) using.icon = ui_style using.screen_loc = ui_drop_throw - using.hud = src static_inventory += using - using = new /atom/movable/screen/resist() + using = new /atom/movable/screen/resist(null, src) using.icon = ui_style using.screen_loc = ui_pull_resist - using.hud = src hotkeybuttons += using - throw_icon = new /atom/movable/screen/throw_catch() + throw_icon = new /atom/movable/screen/throw_catch(null, src) throw_icon.icon = ui_style throw_icon.screen_loc = ui_drop_throw - throw_icon.hud = src hotkeybuttons += throw_icon - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_pull_resist static_inventory += pull_icon //begin indicators - healths = new /atom/movable/screen/healths/alien() - healths.hud = src + healths = new /atom/movable/screen/healths/alien(null, src) infodisplay += healths - alien_plasma_display = new /atom/movable/screen/alien/plasma_display() - alien_plasma_display.hud = src + alien_plasma_display = new /atom/movable/screen/alien/plasma_display(null, src) infodisplay += alien_plasma_display if(!isalienqueen(mymob)) - alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder - alien_queen_finder.hud = src + alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder(null, src) infodisplay += alien_queen_finder - zone_select = new /atom/movable/screen/zone_sel/alien() - zone_select.hud = src + zone_select = new /atom/movable/screen/zone_sel/alien(null, src) zone_select.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() diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index 17d3ad35e4..50848bb37e 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -5,32 +5,26 @@ ..() var/atom/movable/screen/using - action_intent = new /atom/movable/screen/act_intent/alien() + action_intent = new /atom/movable/screen/act_intent/alien(null, src) action_intent.icon_state = mymob.a_intent - action_intent.hud = src static_inventory += action_intent - healths = new /atom/movable/screen/healths/alien() - healths.hud = src + healths = new /atom/movable/screen/healths/alien(null, src) infodisplay += healths - alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder() - alien_queen_finder.hud = src + alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder(null, src) infodisplay += alien_queen_finder - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = 'icons/mob/screen_alien.dmi' - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_pull_resist hotkeybuttons += pull_icon - using = new/atom/movable/screen/language_menu + using = new/atom/movable/screen/language_menu(null, src) using.screen_loc = ui_alien_language_menu - using.hud = src static_inventory += using - zone_select = new /atom/movable/screen/zone_sel/alien() - zone_select.hud = src + zone_select = new /atom/movable/screen/zone_sel/alien(null, src) zone_select.update_icon() static_inventory += zone_select diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index 8a981d5796..7ce0086974 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -127,61 +127,50 @@ ..() var/atom/movable/screen/using - blobpwrdisplay = new /atom/movable/screen() + blobpwrdisplay = new /atom/movable/screen(null, src) blobpwrdisplay.name = "blob power" blobpwrdisplay.icon_state = "block" blobpwrdisplay.screen_loc = ui_health blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT blobpwrdisplay.layer = ABOVE_HUD_LAYER blobpwrdisplay.plane = ABOVE_HUD_PLANE - blobpwrdisplay.hud = src infodisplay += blobpwrdisplay - healths = new /atom/movable/screen/healths/blob() - healths.hud = src + healths = new /atom/movable/screen/healths/blob(null, src) infodisplay += healths - using = new /atom/movable/screen/blob/BlobHelp() + using = new /atom/movable/screen/blob/BlobHelp(null, src) using.screen_loc = "WEST:6,NORTH:-3" - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/JumpToNode() + using = new /atom/movable/screen/blob/JumpToNode(null, src) using.screen_loc = ui_inventory - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/JumpToCore() + using = new /atom/movable/screen/blob/JumpToCore(null, src) using.screen_loc = ui_zonesel - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/Blobbernaut() + using = new /atom/movable/screen/blob/Blobbernaut(null, src) using.screen_loc = ui_belt - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/ResourceBlob() + using = new /atom/movable/screen/blob/ResourceBlob(null, src) using.screen_loc = ui_back - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/NodeBlob() + using = new /atom/movable/screen/blob/NodeBlob(null, src) using.screen_loc = ui_hand_position(2) - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/FactoryBlob() + using = new /atom/movable/screen/blob/FactoryBlob(null, src) using.screen_loc = ui_hand_position(1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/ReadaptStrain() + using = new /atom/movable/screen/blob/ReadaptStrain(null, src) using.screen_loc = ui_storage1 - using.hud = src static_inventory += using - using = new /atom/movable/screen/blob/RelocateCore() + using = new /atom/movable/screen/blob/RelocateCore(null, src) using.screen_loc = ui_storage2 - using.hud = src static_inventory += using diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm index 430e8e81e7..f82be53afa 100644 --- a/code/_onclick/hud/blobbernauthud.dm +++ b/code/_onclick/hud/blobbernauthud.dm @@ -2,10 +2,8 @@ /datum/hud/blobbernaut/New(mob/owner) ..() - blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core() - blobpwrdisplay.hud = src + blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core(null, src) infodisplay += blobpwrdisplay - healths = new /atom/movable/screen/healths/blob/naut() - healths.hud = src + healths = new /atom/movable/screen/healths/blob/naut(null, src) infodisplay += healths diff --git a/code/_onclick/hud/clockwork_marauder.dm b/code/_onclick/hud/clockwork_marauder.dm index de9cb65c75..51d1fbb4a9 100644 --- a/code/_onclick/hud/clockwork_marauder.dm +++ b/code/_onclick/hud/clockwork_marauder.dm @@ -7,14 +7,14 @@ ..() var/atom/movable/screen/using - healths = new /atom/movable/screen/healths/clock() + healths = new /atom/movable/screen/healths/clock(null, src) infodisplay += healths - hosthealth = new /atom/movable/screen/healths/clock() + hosthealth = new /atom/movable/screen/healths/clock(null, src) hosthealth.screen_loc = ui_internal infodisplay += hosthealth - using = new /atom/movable/screen/marauder/emerge() + using = new /atom/movable/screen/marauder/emerge(null, src) using.screen_loc = ui_zonesel static_inventory += using diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm index 31f1060f17..70f40aace3 100644 --- a/code/_onclick/hud/constructs.dm +++ b/code/_onclick/hud/constructs.dm @@ -3,13 +3,11 @@ /datum/hud/constructs/New(mob/owner) ..() - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_construct_pull static_inventory += pull_icon - healths = new /atom/movable/screen/healths/construct() - healths.hud = src + healths = new /atom/movable/screen/healths/construct(null, src) infodisplay += healths diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm index 574f5dd1fd..fb5028145c 100644 --- a/code/_onclick/hud/devil.dm +++ b/code/_onclick/hud/devil.dm @@ -6,51 +6,44 @@ ..() var/atom/movable/screen/using - using = new /atom/movable/screen/drop() + using = new /atom/movable/screen/drop(null, src) using.icon = ui_style using.screen_loc = ui_drone_drop - using.hud = src static_inventory += using - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_drone_pull static_inventory += pull_icon build_hand_slots() - using = new /atom/movable/screen/inventory() + using = new /atom/movable/screen/inventory(null, src) using.name = "hand" using.icon = ui_style using.icon_state = "swap_1_m" using.screen_loc = ui_swaphand_position(owner,1) using.layer = HUD_LAYER using.plane = HUD_PLANE - using.hud = src static_inventory += using - using = new /atom/movable/screen/inventory() + using = new /atom/movable/screen/inventory(null, src) using.name = "hand" using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) using.layer = HUD_LAYER using.plane = HUD_PLANE - using.hud = src static_inventory += using - zone_select = new /atom/movable/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel(null, src) zone_select.icon = ui_style - zone_select.hud = src zone_select.update_icon() - lingchemdisplay = new /atom/movable/screen/ling/chems() - lingchemdisplay.hud = src + lingchemdisplay = new /atom/movable/screen/ling/chems(null, src) - devilsouldisplay = new /atom/movable/screen/devil/soul_counter - devilsouldisplay.hud = src + devilsouldisplay = new /atom/movable/screen/devil/soul_counter(null, src) infodisplay += devilsouldisplay diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm index a2cae89864..a6632b553f 100644 --- a/code/_onclick/hud/drones.dm +++ b/code/_onclick/hud/drones.dm @@ -2,7 +2,7 @@ ..() var/atom/movable/screen/inventory/inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" @@ -11,7 +11,7 @@ inv_box.slot_id = ITEM_SLOT_DEX_STORAGE static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "head/mask" inv_box.icon = ui_style inv_box.icon_state = "mask" @@ -22,7 +22,6 @@ 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() diff --git a/code/_onclick/hud/families.dm b/code/_onclick/hud/families.dm index 6cc9f4ef32..81da541011 100644 --- a/code/_onclick/hud/families.dm +++ b/code/_onclick/hud/families.dm @@ -9,9 +9,6 @@ /// Boolean, have the cops arrived? If so, the icon stops changing and remains the same. var/cops_arrived = 0 -/atom/movable/screen/wanted/New() - return ..() - /atom/movable/screen/wanted/Initialize(mapload) . = ..() update_icon() diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm index 1762bee1fc..a7cfec5a06 100644 --- a/code/_onclick/hud/generic_dextrous.dm +++ b/code/_onclick/hud/generic_dextrous.dm @@ -3,63 +3,55 @@ ..() var/atom/movable/screen/using - using = new /atom/movable/screen/drop() + using = new /atom/movable/screen/drop(null, src) using.icon = ui_style using.screen_loc = ui_drone_drop - using.hud = src static_inventory += using - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_drone_pull static_inventory += pull_icon build_hand_slots() - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_1_m" using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src static_inventory += using if(mymob.possible_a_intents) if(mymob.possible_a_intents.len == 4) // All possible intents - full intent selector - action_intent = new /atom/movable/screen/act_intent/segmented + action_intent = new /atom/movable/screen/act_intent/segmented(null, src) else - action_intent = new /atom/movable/screen/act_intent + action_intent = new /atom/movable/screen/act_intent(null, src) action_intent.icon = ui_style action_intent.icon_state = mymob.a_intent - action_intent.hud = src static_inventory += action_intent - zone_select = new /atom/movable/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel(null, src) zone_select.icon = ui_style - zone_select.hud = src zone_select.update_icon() static_inventory += zone_select - using = new /atom/movable/screen/area_creator + using = new /atom/movable/screen/area_creator(null, src) using.icon = ui_style - using.hud = src static_inventory += using mymob.client.screen = list() 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() diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index f4f1f2f7b0..ea36022dfb 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -49,34 +49,28 @@ ..() var/atom/movable/screen/using - using = new /atom/movable/screen/ghost/jumptomob() + using = new /atom/movable/screen/ghost/jumptomob(null, src) using.screen_loc = ui_ghost_jumptomob - using.hud = src static_inventory += using - using = new /atom/movable/screen/ghost/orbit() + using = new /atom/movable/screen/ghost/orbit(null, src) using.screen_loc = ui_ghost_orbit - using.hud = src static_inventory += using - using = new /atom/movable/screen/ghost/reenter_corpse() + using = new /atom/movable/screen/ghost/reenter_corpse(null, src) using.screen_loc = ui_ghost_reenter_corpse - using.hud = src static_inventory += using - using = new /atom/movable/screen/ghost/teleport() + using = new /atom/movable/screen/ghost/teleport(null, src) using.screen_loc = ui_ghost_teleport - using.hud = src static_inventory += using - using = new /atom/movable/screen/ghost/spawners() + using = new /atom/movable/screen/ghost/spawners(null, src) using.screen_loc = ui_ghost_spawners - using.hud = src static_inventory += using - using = new /atom/movable/screen/language_menu + using = new /atom/movable/screen/language_menu(null, src) using.icon = ui_style - using.hud = src static_inventory += using /datum/hud/ghost/show_hud(version = 0, mob/viewmob) diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm index 09ec5d925c..0443dc3deb 100644 --- a/code/_onclick/hud/guardian.dm +++ b/code/_onclick/hud/guardian.dm @@ -3,33 +3,27 @@ ..() var/atom/movable/screen/using - healths = new /atom/movable/screen/healths/guardian() - healths.hud = src + healths = new /atom/movable/screen/healths/guardian(null, src) infodisplay += healths - using = new /atom/movable/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/Manifest(null, src) using.screen_loc = ui_hand_position(2) - using.hud = src static_inventory += using - using = new /atom/movable/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/Recall(null, src) using.screen_loc = ui_hand_position(1) - using.hud = src static_inventory += using - using = new owner.toggle_button_type() + using = new owner.toggle_button_type(null, src) using.screen_loc = ui_storage1 - using.hud = src static_inventory += using - using = new /atom/movable/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/ToggleLight(null, src) using.screen_loc = ui_inventory - using.hud = src static_inventory += using - using = new /atom/movable/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate(null, src) using.screen_loc = ui_back - using.hud = src static_inventory += using /datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner) //for a dextrous guardian @@ -38,7 +32,7 @@ if(istype(owner, /mob/living/simple_animal/hostile/guardian/dextrous)) var/atom/movable/screen/inventory/inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" @@ -46,32 +40,32 @@ inv_box.slot_id = ITEM_SLOT_DEX_STORAGE static_inventory += inv_box - using = new /atom/movable/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate(null, src) using.screen_loc = ui_sstore1 static_inventory += using else - using = new /atom/movable/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate(null, src) using.screen_loc = ui_id static_inventory += using - healths = new /atom/movable/screen/healths/guardian() + healths = new /atom/movable/screen/healths/guardian(null, src) infodisplay += healths - using = new /atom/movable/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/Manifest(null, src) using.screen_loc = ui_belt static_inventory += using - using = new /atom/movable/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/Recall(null, src) using.screen_loc = ui_back static_inventory += using - using = new owner.toggle_button_type() + using = new owner.toggle_button_type(null, src) using.screen_loc = ui_storage2 static_inventory += using - using = new /atom/movable/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/ToggleLight(null, src) using.screen_loc = ui_inventory static_inventory += using diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 52397c3036..bda691dcc9 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -109,12 +109,12 @@ GLOBAL_LIST_INIT(available_ui_styles, list( hand_slots = list() for(var/mytype in subtypesof(/atom/movable/screen/plane_master)) - var/atom/movable/screen/plane_master/instance = new mytype() + var/atom/movable/screen/plane_master/instance = new mytype(null, src) plane_masters["[instance.plane]"] = instance instance.backdrop(mymob) for(var/mytype in subtypesof(/atom/movable/plane_master_controller)) - var/atom/movable/plane_master_controller/controller_instance = new mytype(src) + var/atom/movable/plane_master_controller/controller_instance = new mytype(null, src) plane_master_controllers[controller_instance.name] = controller_instance screentip_text = new(null, src) @@ -322,14 +322,13 @@ GLOBAL_LIST_INIT(available_ui_styles, list( hand_slots = list() var/atom/movable/screen/inventory/hand/hand_box for(var/i in 1 to mymob.held_items.len) - hand_box = new /atom/movable/screen/inventory/hand() + hand_box = new /atom/movable/screen/inventory/hand(null, src) hand_box.name = mymob.get_held_index_name(i) hand_box.icon = ui_style hand_box.icon_state = "hand_[mymob.held_index_to_dir(i)]" hand_box.screen_loc = ui_hand_position(i) hand_box.held_index = i hand_slots["[i]"] = hand_box - hand_box.hud = src static_inventory += hand_box hand_box.update_icon() diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index c8b7b3327d..5808dec12c 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -186,54 +186,47 @@ var/atom/movable/screen/using var/atom/movable/screen/inventory/inv_box - using = new/atom/movable/screen/language_menu + using = new/atom/movable/screen/language_menu(null, src) using.icon = ui_style if(!widescreenlayout) // CIT CHANGE using.screen_loc = ui_boxlang // CIT CHANGE - using.hud = src static_inventory += using - using = new /atom/movable/screen/area_creator + using = new /atom/movable/screen/area_creator(null, src) using.icon = ui_style if(!widescreenlayout) // CIT CHANGE using.screen_loc = ui_boxarea // CIT CHANGE - using.hud = src static_inventory += using - using = new /atom/movable/screen/voretoggle() //We fancy Vore now + using = new /atom/movable/screen/voretoggle(null, src) //We fancy Vore now using.icon = tg_ui_icon_to_cit_ui(ui_style) using.screen_loc = ui_voremode if(!widescreenlayout) using.screen_loc = ui_boxvore - using.hud = src static_inventory += using - action_intent = new /atom/movable/screen/act_intent/segmented + action_intent = new /atom/movable/screen/act_intent/segmented(null, src) action_intent.icon_state = mymob.a_intent - action_intent.hud = src static_inventory += action_intent assert_move_intent_ui(owner, TRUE) // clickdelay - clickdelay = new - clickdelay.hud = src + clickdelay = new(null, src) clickdelay.screen_loc = ui_clickdelay static_inventory += clickdelay // resistdelay - resistdelay = new - resistdelay.hud = src + resistdelay = new(null, src) resistdelay.screen_loc = ui_resistdelay static_inventory += resistdelay - using = new /atom/movable/screen/drop() + using = new /atom/movable/screen/drop(null, src) using.icon = ui_style using.screen_loc = ui_drop_throw - using.hud = src static_inventory += using - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "uniform" inv_box.icon = ui_style inv_box.slot_id = ITEM_SLOT_ICLOTHING @@ -242,7 +235,7 @@ inv_box.screen_loc = ui_iclothing toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "suit" inv_box.icon = ui_style inv_box.slot_id = ITEM_SLOT_OCLOTHING @@ -253,21 +246,19 @@ build_hand_slots() - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_1" using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src static_inventory += using - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "id" inv_box.icon = ui_style inv_box.icon_state = "id" @@ -276,7 +267,7 @@ inv_box.slot_id = ITEM_SLOT_ID static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "mask" inv_box.icon = ui_style inv_box.icon_state = "mask" @@ -285,7 +276,7 @@ inv_box.slot_id = ITEM_SLOT_MASK toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "neck" inv_box.icon = ui_style inv_box.icon_state = "neck" @@ -294,7 +285,7 @@ inv_box.slot_id = ITEM_SLOT_NECK toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "back" inv_box.icon = ui_style inv_box.icon_state = "back" @@ -303,7 +294,7 @@ inv_box.slot_id = ITEM_SLOT_BACK static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "left pocket" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -312,7 +303,7 @@ inv_box.slot_id = ITEM_SLOT_LPOCKET static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "right pocket" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -321,7 +312,7 @@ inv_box.slot_id = ITEM_SLOT_RPOCKET static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "suit storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" @@ -330,32 +321,28 @@ inv_box.slot_id = ITEM_SLOT_SUITSTORE static_inventory += inv_box - using = new /atom/movable/screen/resist() + using = new /atom/movable/screen/resist(null, src) using.icon = ui_style using.screen_loc = ui_overridden_resist // CIT CHANGE - changes this to overridden resist - using.hud = src hotkeybuttons += using - rest_icon = new /atom/movable/screen/rest() + rest_icon = new /atom/movable/screen/rest(null, src) rest_icon.icon = ui_style rest_icon.screen_loc = ui_pull_resist - rest_icon.hud = src static_inventory += rest_icon //END OF CIT CHANGES - using = new /atom/movable/screen/human/toggle() + using = new /atom/movable/screen/human/toggle(null, src) using.icon = ui_style using.screen_loc = ui_inventory - using.hud = src static_inventory += using - using = new /atom/movable/screen/human/equip() + using = new /atom/movable/screen/human/equip(null, src) using.icon = ui_style using.screen_loc = ui_equip_position(mymob) - using.hud = src static_inventory += using - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "gloves" inv_box.icon = ui_style inv_box.icon_state = "gloves" @@ -364,7 +351,7 @@ inv_box.slot_id = ITEM_SLOT_GLOVES toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "eyes" inv_box.icon = ui_style inv_box.icon_state = "glasses" @@ -373,7 +360,7 @@ inv_box.slot_id = ITEM_SLOT_EYES toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "ears" inv_box.icon = ui_style inv_box.icon_state = "ears" @@ -382,7 +369,7 @@ inv_box.slot_id = ITEM_SLOT_EARS toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "head" inv_box.icon = ui_style inv_box.icon_state = "head" @@ -391,7 +378,7 @@ inv_box.slot_id = ITEM_SLOT_HEAD toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "shoes" inv_box.icon = ui_style inv_box.icon_state = "shoes" @@ -400,7 +387,7 @@ inv_box.slot_id = ITEM_SLOT_FEET toggleable_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "belt" inv_box.icon = ui_style inv_box.icon_state = "belt" @@ -409,77 +396,62 @@ inv_box.slot_id = ITEM_SLOT_BELT static_inventory += inv_box - throw_icon = new /atom/movable/screen/throw_catch() + throw_icon = new /atom/movable/screen/throw_catch(null, src) throw_icon.icon = ui_style throw_icon.screen_loc = ui_drop_throw - throw_icon.hud = src hotkeybuttons += throw_icon - healths = new /atom/movable/screen/healths() - healths.hud = src + healths = new /atom/movable/screen/healths(null, src) infodisplay += healths - staminas = new /atom/movable/screen/staminas() - staminas.hud = src + staminas = new /atom/movable/screen/staminas(null, src) infodisplay += staminas if(!CONFIG_GET(flag/disable_stambuffer)) - staminabuffer = new /atom/movable/screen/staminabuffer() - staminabuffer.hud = src + staminabuffer = new /atom/movable/screen/staminabuffer(null, src) infodisplay += staminabuffer //END OF CIT CHANGES - healthdoll = new /atom/movable/screen/healthdoll() - healthdoll.hud = src + healthdoll = new /atom/movable/screen/healthdoll(null, src) infodisplay += healthdoll - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_pull_resist static_inventory += pull_icon - lingchemdisplay = new /atom/movable/screen/ling/chems() - lingchemdisplay.hud = src + lingchemdisplay = new /atom/movable/screen/ling/chems(null, src) infodisplay += lingchemdisplay - lingstingdisplay = new /atom/movable/screen/ling/sting() - lingstingdisplay.hud = src + lingstingdisplay = new /atom/movable/screen/ling/sting(null, src) infodisplay += lingstingdisplay - devilsouldisplay = new /atom/movable/screen/devil/soul_counter - devilsouldisplay.hud = src + devilsouldisplay = new /atom/movable/screen/devil/soul_counter(null, src) infodisplay += devilsouldisplay - blood_display = new /atom/movable/screen/bloodsucker/blood_counter // Blood Volume - blood_display.hud = src + blood_display = new /atom/movable/screen/bloodsucker/blood_counter(null, src) // Blood Volume infodisplay += blood_display - vamprank_display = new /atom/movable/screen/bloodsucker/rank_counter // Bloodsucker Rank - vamprank_display.hud = src + vamprank_display = new /atom/movable/screen/bloodsucker/rank_counter(null, src) // Bloodsucker Rank infodisplay += vamprank_display - sunlight_display = new /atom/movable/screen/bloodsucker/sunlight_counter // Sunlight - sunlight_display.hud = src + sunlight_display = new /atom/movable/screen/bloodsucker/sunlight_counter(null, src) // Sunlight infodisplay += sunlight_display - coolant_display = new /atom/movable/screen/synth/coolant_counter //Coolant & cooling efficiency readouts for Synths. - coolant_display.hud = src + coolant_display = new /atom/movable/screen/synth/coolant_counter(null, src) //Coolant & cooling efficiency readouts for Synths. infodisplay += coolant_display - zone_select = new /atom/movable/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel(null, src) zone_select.icon = ui_style - zone_select.hud = src zone_select.update_icon() static_inventory += zone_select - combo_display = new /atom/movable/screen/combo() + combo_display = new /atom/movable/screen/combo(null, src) infodisplay += combo_display 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() @@ -500,10 +472,9 @@ // make new ones // walk/run - using = new /atom/movable/screen/mov_intent + using = new /atom/movable/screen/mov_intent(null, src) using.icon = tg_ui_icon_to_cit_ui(ui_style) // CIT CHANGE - overrides mov intent icon using.screen_loc = ui_movi - using.hud = src using.update_icon() static_inventory += using if(!on_new) @@ -513,19 +484,17 @@ return // sprint button - using = new /atom/movable/screen/sprintbutton + using = new /atom/movable/screen/sprintbutton(null, src) using.icon = tg_ui_icon_to_cit_ui(ui_style) using.icon_state = ((owner.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) ? "act_sprint_on" : "act_sprint") using.screen_loc = ui_movi - using.hud = src static_inventory += using if(!on_new) owner?.client?.screen += using // same as above but buffer. - sprint_buffer = new /atom/movable/screen/sprint_buffer + sprint_buffer = new /atom/movable/screen/sprint_buffer(null, src) sprint_buffer.screen_loc = ui_sprintbufferloc - sprint_buffer.hud = src static_inventory += sprint_buffer if(!on_new) owner?.client?.screen += using diff --git a/code/_onclick/hud/lavaland_elite.dm b/code/_onclick/hud/lavaland_elite.dm index f3ca5fec32..6df374cd10 100644 --- a/code/_onclick/hud/lavaland_elite.dm +++ b/code/_onclick/hud/lavaland_elite.dm @@ -4,13 +4,11 @@ /datum/hud/lavaland_elite/New(mob/living/simple_animal/hostile/asteroid/elite) ..() - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style - pull_icon.hud = src pull_icon.update_icon() pull_icon.screen_loc = ui_living_pull static_inventory += pull_icon - healths = new /atom/movable/screen/healths/lavaland_elite() - healths.hud = src + healths = new /atom/movable/screen/healths/lavaland_elite(null, src) infodisplay += healths diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 9ee795a745..ddb5662889 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -3,48 +3,42 @@ var/atom/movable/screen/using var/atom/movable/screen/inventory/inv_box - action_intent = new /atom/movable/screen/act_intent() + action_intent = new /atom/movable/screen/act_intent(null, src) action_intent.icon = ui_style action_intent.icon_state = mymob.a_intent action_intent.screen_loc = ui_acti - action_intent.hud = src static_inventory += action_intent - using = new /atom/movable/screen/mov_intent() + using = new /atom/movable/screen/mov_intent(null, src) using.icon = ui_style using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi - using.hud = src static_inventory += using - using = new/atom/movable/screen/language_menu + using = new/atom/movable/screen/language_menu(null, src) using.icon = ui_style - using.hud = src static_inventory += using - using = new /atom/movable/screen/drop() + using = new /atom/movable/screen/drop(null, src) using.icon = ui_style using.screen_loc = ui_drop_throw - using.hud = src static_inventory += using build_hand_slots() - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_1_m" //extra wide! using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swap_hand() + using = new /atom/movable/screen/swap_hand(null, src) using.icon = ui_style using.icon_state = "swap_2" using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src static_inventory += using - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "mask" inv_box.icon = ui_style inv_box.icon_state = "mask" @@ -53,7 +47,7 @@ inv_box.slot_id = ITEM_SLOT_MASK static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "neck" inv_box.icon = ui_style inv_box.icon_state = "neck" @@ -62,7 +56,7 @@ inv_box.slot_id = ITEM_SLOT_NECK static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "head" inv_box.icon = ui_style inv_box.icon_state = "head" @@ -71,7 +65,7 @@ inv_box.slot_id = ITEM_SLOT_HEAD static_inventory += inv_box - inv_box = new /atom/movable/screen/inventory() + inv_box = new /atom/movable/screen/inventory(null, src) inv_box.name = "back" inv_box.icon = ui_style inv_box.icon_state = "back" @@ -79,49 +73,41 @@ inv_box.slot_id = ITEM_SLOT_BACK static_inventory += inv_box - throw_icon = new /atom/movable/screen/throw_catch() + throw_icon = new /atom/movable/screen/throw_catch(null, src) throw_icon.icon = ui_style throw_icon.screen_loc = ui_drop_throw - throw_icon.hud = src hotkeybuttons += throw_icon - healths = new /atom/movable/screen/healths() - healths.hud = src + healths = new /atom/movable/screen/healths(null, src) infodisplay += healths - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style pull_icon.screen_loc = ui_pull_resist - pull_icon.hud = src pull_icon.update_icon() static_inventory += pull_icon - lingchemdisplay = new /atom/movable/screen/ling/chems() - lingchemdisplay.hud = src + lingchemdisplay = new /atom/movable/screen/ling/chems(null, src) infodisplay += lingchemdisplay - lingstingdisplay = new /atom/movable/screen/ling/sting() - lingstingdisplay.hud = src + lingstingdisplay = new /atom/movable/screen/ling/sting(null, src) infodisplay += lingstingdisplay - zone_select = new /atom/movable/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel(null, src) zone_select.icon = ui_style - zone_select.hud = src zone_select.update_icon() static_inventory += zone_select mymob.client.screen = list() - using = new /atom/movable/screen/resist() + using = new /atom/movable/screen/resist(null, src) using.icon = ui_style using.screen_loc = ui_pull_resist - using.hud = src hotkeybuttons += using 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() diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index c7f40e4dcc..e58d330eae 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -1,9 +1,12 @@ #define SHUTTER_MOVEMENT_DURATION 0.4 SECONDS #define SHUTTER_WAIT_DURATION 0.2 SECONDS +/// Maximum number of station trait buttons we will display, please think hard before creating scenarios where there are more than this +#define MAX_STATION_TRAIT_BUTTONS_VERTICAL 3 /datum/hud/new_player ///Whether the menu is currently on the client's screen or not var/menu_hud_status = TRUE + var/list/shown_station_trait_buttons /datum/hud/new_player/New(mob/dead/new_player/owner) . = ..() @@ -13,29 +16,89 @@ /datum/hud/new_player/proc/populate_buttons(mob/dead/new_player/owner) var/list/buttons = subtypesof(/atom/movable/screen/lobby) - for(var/button_type in buttons) - var/atom/movable/screen/lobby/lobbyscreen = new button_type(our_hud = src) + for (var/atom/movable/screen/lobby/lobbyscreen as anything in buttons) + if (!initial(lobbyscreen.always_available)) + continue + lobbyscreen = new lobbyscreen(our_hud = src) lobbyscreen.SlowInit() - lobbyscreen.hud = src static_inventory += lobbyscreen if(!lobbyscreen.always_shown) lobbyscreen.RegisterSignal(src, COMSIG_HUD_LOBBY_COLLAPSED, TYPE_PROC_REF(/atom/movable/screen/lobby, collapse_button)) lobbyscreen.RegisterSignal(src, COMSIG_HUD_LOBBY_EXPANDED, TYPE_PROC_REF(/atom/movable/screen/lobby, expand_button)) - if(istype(lobbyscreen, /atom/movable/screen/lobby/button)) - var/atom/movable/screen/lobby/button/lobby_button = lobbyscreen - lobby_button.owner = REF(owner) + + if(owner.client.is_localhost()) + var/atom/movable/screen/lobby/button/start_now/start_button = new(our_hud = src) + start_button.SlowInit() + static_inventory += start_button + start_button.RegisterSignal(src, COMSIG_HUD_LOBBY_COLLAPSED, TYPE_PROC_REF(/atom/movable/screen/lobby, collapse_button)) + start_button.RegisterSignal(src, COMSIG_HUD_LOBBY_EXPANDED, TYPE_PROC_REF(/atom/movable/screen/lobby, expand_button)) + show_hud(hud_version) +/// Load and then display the buttons for relevant station traits +/datum/hud/new_player/proc/show_station_trait_buttons() + var/mob/dead/new_player/user = mymob + if (!user.age_verify()) + return + for (var/datum/station_trait/trait as anything in GLOB.lobby_station_traits) + if (QDELETED(trait) || !trait.can_display_lobby_button(mymob.client)) + remove_station_trait_button(trait) + continue + if(LAZYACCESS(shown_station_trait_buttons, trait)) + continue + var/atom/movable/screen/lobby/button/sign_up/sign_up_button = new(our_hud = src) + trait.setup_lobby_button(sign_up_button) + static_inventory |= sign_up_button + LAZYSET(shown_station_trait_buttons, trait, sign_up_button) + RegisterSignal(trait, COMSIG_PARENT_QDELETING, PROC_REF(remove_station_trait_button)) + + place_station_trait_buttons() + +/// Display the buttosn for relevant station traits. +/datum/hud/new_player/proc/place_station_trait_buttons() + if(hud_version != HUD_STYLE_STANDARD || !mymob?.client) + return + + var/y_offset = 397 + var/x_offset = 233 + var/y_button_offset = 27 + var/x_button_offset = -27 + var/iteration = 0 + for(var/trait in shown_station_trait_buttons) + var/atom/movable/screen/lobby/button/sign_up/sign_up_button = shown_station_trait_buttons[trait] + iteration++ + sign_up_button.screen_loc = offset_to_screen_loc(x_offset, y_offset, mymob.client.view) + mymob.client.screen |= sign_up_button + if (iteration >= MAX_STATION_TRAIT_BUTTONS_VERTICAL) + iteration = 0 + y_offset = 397 + x_offset += x_button_offset + else + y_offset += y_button_offset + +/// Remove a station trait button, then re-order the rest. +/datum/hud/new_player/proc/remove_station_trait_button(datum/station_trait/trait) + SIGNAL_HANDLER + var/atom/movable/screen/lobby/button/sign_up/button = LAZYACCESS(shown_station_trait_buttons, trait) + if(!button) + return + LAZYREMOVE(shown_station_trait_buttons, trait) + UnregisterSignal(trait, COMSIG_PARENT_QDELETING) + static_inventory -= button + qdel(button) + place_station_trait_buttons() + /atom/movable/screen/lobby plane = SPLASHSCREEN_PLANE layer = LOBBY_MENU_LAYER screen_loc = "TOP,CENTER" ///Whether this HUD element can be hidden from the client's "screen" (moved off-screen) or not var/always_shown = FALSE + /// If true we will create this button every time the HUD is generated + var/always_available = TRUE /atom/movable/screen/lobby/New(loc, datum/hud/our_hud, ...) - if(our_hud) - hud = our_hud + set_new_hud(our_hud) return ..() /// Run sleeping actions after initialize @@ -67,11 +130,15 @@ VAR_PROTECTED/enabled = TRUE ///Is the button currently being hovered over with the mouse? var/highlighted = FALSE - /// The ref of the mob that owns this button. Only the owner can click on it. - var/owner + ///Should this button play the select sound? + var/select_sound_play = TRUE /atom/movable/screen/lobby/button/Click(location, control, params) - if(owner != REF(usr)) + if(usr != get_mob()) + return + + var/mob/dead/new_player/user = usr + if(!user.age_verify()) return . = ..() @@ -79,11 +146,19 @@ if(!enabled) return flick("[base_icon_state]_pressed", src) + if(select_sound_play) + var/sound/ui_select_sound = sound('sound/misc/menu/ui_select1.ogg') + ui_select_sound.frequency = get_rand_frequency_low_range() + SEND_SOUND(hud.mymob, ui_select_sound) update_appearance(UPDATE_ICON) return TRUE /atom/movable/screen/lobby/button/MouseEntered(location,control,params) - if(owner != REF(usr)) + if(usr != get_mob()) + return + + var/mob/dead/new_player/user = usr + if(!user.age_verify()) return . = ..() @@ -91,7 +166,11 @@ update_appearance(UPDATE_ICON) /atom/movable/screen/lobby/button/MouseExited() - if(owner != REF(usr)) + if(usr != get_mob()) + return + + var/mob/dead/new_player/user = usr + if(!user.age_verify()) return . = ..() @@ -178,6 +257,7 @@ new_player.ready = PLAYER_NOT_READY base_icon_state = "not_ready" update_appearance(UPDATE_ICON) + SEND_SIGNAL(hud, COMSIG_HUD_PLAYER_READY_TOGGLE) ///Shown when the game has started /atom/movable/screen/lobby/button/join @@ -186,12 +266,13 @@ icon = 'icons/hud/lobby/join.dmi' icon_state = "" //Default to not visible base_icon_state = "join_game" + enabled = null // set in init /atom/movable/screen/lobby/button/join/Initialize(mapload) . = ..() - set_button_status(FALSE) switch(SSticker.current_state) if(GAME_STATE_PREGAME, GAME_STATE_STARTUP) + set_button_status(FALSE) RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(show_join_button)) if(GAME_STATE_SETTING_UP) set_button_status(TRUE) @@ -250,6 +331,7 @@ icon = 'icons/hud/lobby/observe.dmi' icon_state = "observe_disabled" base_icon_state = "observe" + enabled = null // set in init /atom/movable/screen/lobby/button/observe/Initialize(mapload) . = ..() @@ -378,6 +460,23 @@ var/mob/dead/new_player/new_player = hud.mymob new_player.handle_player_polling() +/// A generic "sign up" button used by station traits +/atom/movable/screen/lobby/button/sign_up + icon = 'icons/hud/lobby/signup_button.dmi' + icon_state = "signup" + base_icon_state = "signup" + always_available = FALSE + +/atom/movable/screen/lobby/button/sign_up/MouseEntered(location, control, params) + . = ..() + if(QDELETED(src) || !desc) + return + openToolTip(usr, tip_src = src, params = params, title = name, content = desc,) + +/atom/movable/screen/lobby/button/sign_up/MouseExited() + . = ..() + closeToolTip(usr) + /atom/movable/screen/lobby/button/collapse name = "Collapse Lobby Menu" icon = 'icons/hud/lobby/collapse_expand.dmi' @@ -387,6 +486,27 @@ screen_loc = "TOP:-82,CENTER:-54" always_shown = TRUE + var/blip_enabled = TRUE + +/atom/movable/screen/lobby/button/collapse/Initialize(mapload, datum/hud/hud_owner) + . = ..() + switch(SSticker.current_state) + if(GAME_STATE_PREGAME, GAME_STATE_STARTUP) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(disable_blip)) + RegisterSignal(hud, COMSIG_HUD_PLAYER_READY_TOGGLE, PROC_REF(on_player_ready_toggle)) + if(GAME_STATE_SETTING_UP) + blip_enabled = FALSE + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(enable_blip)) + else + blip_enabled = FALSE + + add_overlay(get_blip_overlay()) + update_icon(UPDATE_OVERLAYS) + +/atom/movable/screen/lobby/button/collapse/update_overlays() + . = ..() + . += get_blip_overlay() + /atom/movable/screen/lobby/button/collapse/Click(location, control, params) . = ..() if(!.) @@ -416,6 +536,38 @@ sleep(2 * SHUTTER_MOVEMENT_DURATION + SHUTTER_WAIT_DURATION) set_button_status(TRUE) +///Proc to update the ready blip state upon new player's ready status change +/atom/movable/screen/lobby/button/collapse/proc/on_player_ready_toggle() + SIGNAL_HANDLER + update_appearance(UPDATE_ICON) + +///Returns a ready blip overlay depending on the player's ready state +/atom/movable/screen/lobby/button/collapse/proc/get_blip_overlay() + var/blip_icon_state = "ready_blip" + if(blip_enabled && hud) + var/mob/dead/new_player/new_player = hud.mymob + blip_icon_state += "_[new_player.ready ? "" : "not_"]ready" + else + blip_icon_state += "_disabled" + var/mutable_appearance/ready_blip = mutable_appearance(icon, blip_icon_state) + return ready_blip + +///Disables the ready blip; makes us listen for the setup error to re-enable the blip +/atom/movable/screen/lobby/button/collapse/proc/disable_blip() + SIGNAL_HANDLER + blip_enabled = FALSE + UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(enable_blip)) + update_appearance(UPDATE_ICON) + +///Enables the ready blip; makes us listen for the setup completion and game start to disable the blip +/atom/movable/screen/lobby/button/collapse/proc/enable_blip() + SIGNAL_HANDLER + blip_enabled = TRUE + UnregisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(disable_blip)) + update_appearance(UPDATE_ICON) + ///Moves the button to the top of the screen, leaving only the screen part in view ///Sends a signal on the hud for the menu hud elements to listen to /atom/movable/screen/lobby/button/collapse/proc/collapse_menu() @@ -424,12 +576,14 @@ animate(src, transform = transform, time = SHUTTER_MOVEMENT_DURATION + SHUTTER_WAIT_DURATION) //then pull the button up with the shutter and leave it on the edge of the screen animate(transform = transform.Translate(x = 0, y = 134), time = SHUTTER_MOVEMENT_DURATION, easing = CUBIC_EASING|EASE_IN) + SEND_SOUND(hud.mymob, sound('sound/misc/menu/menu_rollup1.ogg')) ///Extends the button back to its usual spot ///Sends a signal on the hud for the menu hud elements to listen to /atom/movable/screen/lobby/button/collapse/proc/expand_menu() SEND_SIGNAL(hud, COMSIG_HUD_LOBBY_EXPANDED) animate(src, transform = matrix(), time = SHUTTER_MOVEMENT_DURATION, easing = CUBIC_EASING|EASE_OUT) + SEND_SOUND(hud.mymob, sound('sound/misc/menu/menu_rolldown1.ogg')) /atom/movable/screen/lobby/shutter icon = 'icons/hud/lobby/shutter.dmi' @@ -450,5 +604,22 @@ //pull the shutter back off-screen animate(transform = matrix(), time = SHUTTER_MOVEMENT_DURATION, easing = CUBIC_EASING|EASE_IN) +/// LOCALHOST ONLY - Start Now button +/atom/movable/screen/lobby/button/start_now + name = "Start Now (LOCALHOST ONLY)" + screen_loc = "TOP:-146,CENTER:-54" + icon = 'icons/hud/lobby/start_now.dmi' + icon_state = "start_now" + base_icon_state = "start_now" + always_available = FALSE + select_sound_play = FALSE + +/atom/movable/screen/lobby/button/start_now/Click(location, control, params) + . = ..() + if(!. || !usr.client.is_localhost() || !check_rights_for(usr.client, R_SERVER)) + return + SEND_SOUND(hud.mymob, sound('sound/effects/splat.ogg', volume = 50)) + SSticker.start_immediately = TRUE + #undef SHUTTER_MOVEMENT_DURATION #undef SHUTTER_WAIT_DURATION diff --git a/code/_onclick/hud/plane_master_controller.dm b/code/_onclick/hud/plane_master_controller.dm index e27bd3bc55..c2ec1417b2 100644 --- a/code/_onclick/hud/plane_master_controller.dm +++ b/code/_onclick/hud/plane_master_controller.dm @@ -5,8 +5,11 @@ ///hud that owns this controller var/datum/hud/owner_hud + +INITIALIZE_IMMEDIATE(/atom/movable/plane_master_controller) + ///Ensures that all the planes are correctly in the controlled_planes list. -/atom/movable/plane_master_controller/New(hud) +/atom/movable/plane_master_controller/Initialize(mapload, datum/hud/hud) . = ..() owner_hud = hud var/assoc_controlled_planes = list() diff --git a/code/_onclick/hud/radial_persistent.dm b/code/_onclick/hud/radial_persistent.dm index e7f7c664ad..b5fa494c94 100644 --- a/code/_onclick/hud/radial_persistent.dm +++ b/code/_onclick/hud/radial_persistent.dm @@ -7,8 +7,8 @@ icon_state = "radial_center" /atom/movable/screen/radial/persistent/center/Click(location, control, params) - if(usr.client == parent.current_user) - parent.element_chosen(null,usr) + if(usr == get_mob()) + parent.element_chosen(null, usr) /atom/movable/screen/radial/persistent/center/MouseEntered(location, control, params) . = ..() diff --git a/code/_onclick/hud/revenanthud.dm b/code/_onclick/hud/revenanthud.dm index 708b1d4915..a98ef60a1a 100644 --- a/code/_onclick/hud/revenanthud.dm +++ b/code/_onclick/hud/revenanthud.dm @@ -2,6 +2,5 @@ /datum/hud/revenant/New(mob/owner) ..() - healths = new /atom/movable/screen/healths/revenant() - healths.hud = src + healths = new /atom/movable/screen/healths/revenant(null, src) infodisplay += healths diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 58b52dea49..54987d541e 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -78,64 +78,56 @@ var/mob/living/silicon/robot/robit = mymob var/atom/movable/screen/using - using = new/atom/movable/screen/language_menu + using = new/atom/movable/screen/language_menu(null, src) using.screen_loc = ui_borg_language_menu static_inventory += using //Radio - using = new /atom/movable/screen/robot/radio() + using = new /atom/movable/screen/robot/radio(null, src) using.screen_loc = ui_borg_radio - using.hud = src static_inventory += using //Module select if(!robit.inv1) - robit.inv1 = new /atom/movable/screen/robot/module1() + robit.inv1 = new /atom/movable/screen/robot/module1(null, src) robit.inv1.screen_loc = ui_inv1 - robit.inv1.hud = src static_inventory += robit.inv1 if(!robit.inv2) - robit.inv2 = new /atom/movable/screen/robot/module2() + robit.inv2 = new /atom/movable/screen/robot/module2(null, src) robit.inv2.screen_loc = ui_inv2 - robit.inv2.hud = src static_inventory += robit.inv2 if(!robit.inv3) - robit.inv3 = new /atom/movable/screen/robot/module3() + robit.inv3 = new /atom/movable/screen/robot/module3(null, src) robit.inv3.screen_loc = ui_inv3 - robit.inv3.hud = src static_inventory += robit.inv3 //End of module select - using = new /atom/movable/screen/robot/lamp() + using = new /atom/movable/screen/robot/lamp(null, src) using.screen_loc = ui_borg_lamp - using.hud = src static_inventory += using robit.lampButton = using var/atom/movable/screen/robot/lamp/lampscreen = using lampscreen.robot = robit //Photography stuff - using = new /atom/movable/screen/ai/image_take() + using = new /atom/movable/screen/ai/image_take(null, src) using.screen_loc = ui_borg_camera - using.hud = src static_inventory += using //Sec/Med HUDs - using = new /atom/movable/screen/robot/sensors() + using = new /atom/movable/screen/robot/sensors(null, src) using.screen_loc = ui_borg_sensor - using.hud = src static_inventory += using //Borg Integrated Tablet - using = new /atom/movable/screen/robot/modPC() + using = new /atom/movable/screen/robot/modPC(null, src) using.screen_loc = ui_borg_tablet - using.hud = src static_inventory += using robit.interfaceButton = using if(robit.modularInterface) @@ -144,64 +136,54 @@ tabletbutton.robot = robit //Alerts - using = new /atom/movable/screen/robot/alerts() + using = new /atom/movable/screen/robot/alerts(null, src) using.screen_loc = ui_borg_alerts - using.hud = src static_inventory += using //Thrusters - using = new /atom/movable/screen/robot/thrusters() + using = new /atom/movable/screen/robot/thrusters(null, src) using.screen_loc = ui_borg_thrusters - using.hud = src static_inventory += using robit.thruster_button = using //PDA message - using = new /atom/movable/screen/robot/pda_msg_send + using = new /atom/movable/screen/robot/pda_msg_send(null, src) using.screen_loc = ui_borg_pda_send - using.hud = src static_inventory += using //PDA log - using = new /atom/movable/screen/robot/pda_msg_show + using = new /atom/movable/screen/robot/pda_msg_show(null, src) using.screen_loc = ui_borg_pda_log - using.hud = src static_inventory += using //Intent - action_intent = new /atom/movable/screen/act_intent/robot() + action_intent = new /atom/movable/screen/act_intent/robot(null, src) action_intent.icon_state = mymob.a_intent - action_intent.hud = src static_inventory += action_intent assert_move_intent_ui(owner, TRUE) //Health - healths = new /atom/movable/screen/healths/robot() - healths.hud = src + healths = new /atom/movable/screen/healths/robot(null, src) infodisplay += healths //Installed Module - robit.hands = new /atom/movable/screen/robot/module() + robit.hands = new /atom/movable/screen/robot/module(null, src) robit.hands.screen_loc = ui_borg_module - robit.hands.hud = src static_inventory += robit.hands //Store - module_store_icon = new /atom/movable/screen/robot/store() + module_store_icon = new /atom/movable/screen/robot/store(null, src) module_store_icon.screen_loc = ui_borg_store - module_store_icon.hud = src - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = 'icons/mob/screen_cyborg.dmi' pull_icon.screen_loc = ui_borg_pull - pull_icon.hud = src pull_icon.update_icon() hotkeybuttons += pull_icon - zone_select = new /atom/movable/screen/zone_sel/robot() - zone_select.hud = src + zone_select = new /atom/movable/screen/zone_sel/robot(null, src) zone_select.update_icon() static_inventory += zone_select @@ -222,7 +204,6 @@ using = new /atom/movable/screen/mov_intent using.icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' using.screen_loc = ui_borg_movi - using.hud = src using.update_icon() static_inventory += using if(!on_new) @@ -236,7 +217,6 @@ using.icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' using.icon_state = owner.cansprint ? ((owner.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) ? "act_sprint_on" : "act_sprint") : "act_sprint_locked" using.screen_loc = ui_borg_movi - using.hud = src static_inventory += using if(!on_new) owner?.client?.screen += using diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 8e3dd1ccce..27d846f8fb 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -17,7 +17,7 @@ /// A reference to the object in the slot. Grabs or items, generally. var/obj/master = null /// A reference to the owner HUD, if any. - var/datum/hud/hud = null + VAR_PRIVATE/datum/hud/hud = null /** * Map name assigned to this object. * Automatically set by /client/proc/add_obj_to_map. @@ -31,12 +31,36 @@ * But for now, this works. */ var/del_on_map_removal = TRUE + /// If FALSE, this will not be cleared when calling /client/clear_screen() + // var/clear_with_screen = TRUE // Unimplemented + /// If TRUE, clicking the screen element will fall through and perform a default "Click" call + /// Obviously this requires your Click override, if any, to call parent on their own. + /// This is set to FALSE to default to dissade you from doing this. + /// Generally we don't want default Click stuff, which results in bugs like using Telekinesis on a screen element + /// or trying to point your gun at your screen. + var/default_click = FALSE + +/atom/movable/screen/Initialize(mapload, datum/hud/hud_owner) + . = ..() + if(isnull(hud_owner)) //some screens set their hud owners on /new, this prevents overriding them with null post atoms init + return + set_new_hud(hud_owner) /atom/movable/screen/Destroy() master = null hud = null return ..() +/atom/movable/screen/Click(location, control, params) + if(flags_1 & INITIALIZED_1) + SEND_SIGNAL(src, COMSIG_SCREEN_ELEMENT_CLICK, location, control, params, usr) + if(default_click) + return ..() + +///Screen elements are always on top of the players screen and don't move so yes they are adjacent +/atom/movable/screen/Adjacent(atom/neighbor, atom/target, atom/movable/mover) + return TRUE + /atom/movable/screen/examine(mob/user) return list() @@ -46,6 +70,25 @@ /atom/movable/screen/proc/component_click(atom/movable/screen/component_button/component, params) return +///setter used to set our new hud +/atom/movable/screen/proc/set_new_hud(datum/hud/hud_owner) + if(hud) + UnregisterSignal(hud, COMSIG_PARENT_QDELETING) + if(isnull(hud_owner)) + hud = null + return + hud = hud_owner + RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(on_hud_delete)) + +/// Returns the mob this is being displayed to, if any +/atom/movable/screen/proc/get_mob() + return hud?.mymob + +/atom/movable/screen/proc/on_hud_delete(datum/source) + SIGNAL_HANDLER + + set_new_hud(hud_owner = null) + /atom/movable/screen/text icon = null icon_state = null @@ -112,7 +155,6 @@ mouse_over_pointer = MOUSE_HAND_POINTER /atom/movable/screen/language_menu/Click() - usr.get_language_holder().open_language_menu(usr) /atom/movable/screen/inventory @@ -614,7 +656,9 @@ plane = SPLASHSCREEN_PLANE var/client/holder -/atom/movable/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE, except its not easy +INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) + +/atom/movable/screen/splash/Initialize(mapload, datum/hud/hud_owner, client/C, visible, use_previous_title) . = ..() if(!istype(C)) return @@ -629,8 +673,7 @@ icon = SStitle.icon else if(!SStitle.previous_icon) - qdel(src) - return + return INITIALIZE_HINT_QDEL icon = SStitle.previous_icon holder.screen += src diff --git a/code/_onclick/hud/simple_animal.dm b/code/_onclick/hud/simple_animal.dm index 2f7902c965..3549bc38fb 100644 --- a/code/_onclick/hud/simple_animal.dm +++ b/code/_onclick/hud/simple_animal.dm @@ -1,15 +1,14 @@ /datum/hud/living/simple_animal ui_style = 'icons/mob/screen_gen.dmi' + /datum/hud/living/simple_animal/New(mob/living/owner) ..() - pull_icon = new /atom/movable/screen/pull() + pull_icon = new /atom/movable/screen/pull(null, src) pull_icon.icon = ui_style pull_icon.update_icon() pull_icon.screen_loc = ui_living_pull - pull_icon.hud = src static_inventory += pull_icon //mob health doll! assumes whatever sprite the mob is - healthdoll = new /atom/movable/screen/healthdoll/living() - healthdoll.hud = src + healthdoll = new /atom/movable/screen/healthdoll/living(null, src) infodisplay += healthdoll diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm index 6aba23fab5..ca0cbc458a 100644 --- a/code/_onclick/hud/swarmer.dm +++ b/code/_onclick/hud/swarmer.dm @@ -67,32 +67,26 @@ ..() var/atom/movable/screen/using - using = new /atom/movable/screen/swarmer/FabricateTrap() + using = new /atom/movable/screen/swarmer/FabricateTrap(null, src) using.screen_loc = ui_hand_position(2) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swarmer/Barricade() + using = new /atom/movable/screen/swarmer/Barricade(null, src) using.screen_loc = ui_hand_position(1) - using.hud = src static_inventory += using - using = new /atom/movable/screen/swarmer/Replicate() + using = new /atom/movable/screen/swarmer/Replicate(null, src) using.screen_loc = ui_zonesel - using.hud = src static_inventory += using - using = new /atom/movable/screen/swarmer/RepairSelf() + using = new /atom/movable/screen/swarmer/RepairSelf(null, src) using.screen_loc = ui_storage1 - using.hud = src static_inventory += using - using = new /atom/movable/screen/swarmer/ToggleLight() + using = new /atom/movable/screen/swarmer/ToggleLight(null, src) using.screen_loc = ui_back - using.hud = src static_inventory += using - using = new /atom/movable/screen/swarmer/ContactSwarmers() + using = new /atom/movable/screen/swarmer/ContactSwarmers(null, src) using.screen_loc = ui_inventory - using.hud = src static_inventory += using diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index f812ea8c4a..c4cdfb11b4 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -77,8 +77,17 @@ PROCESSING_SUBSYSTEM_DEF(station) var/datum/station_trait/trait_instance = new trait_type() can_fire = can_fire || trait_instance.trait_processes station_traits += trait_instance + log_game("Station Trait: [trait_instance.name] chosen for this round.") if(!trait_instance.blacklist) return for(var/i in trait_instance.blacklist) var/datum/station_trait/trait_to_remove = i selectable_traits_by_types[initial(trait_to_remove.trait_type)] -= trait_to_remove + +/// Update station trait lobby buttons for clients who joined before we initialised this subsystem +/datum/controller/subsystem/processing/station/proc/display_lobby_traits() + for (var/mob/dead/new_player/player as anything in GLOB.new_player_list) + var/datum/hud/new_player/observer_hud = player.hud_used + if (!istype(observer_hud)) + continue + observer_hud.show_station_trait_buttons() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 9e4ca0a6c0..859eea4cd9 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -161,7 +161,7 @@ SUBSYSTEM_DEF(ticker) start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. - to_chat(world, "Welcome to [station_name()]!") + to_chat(world, span_boldnotice("Welcome to [station_name()]!")) send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/chat_announce_new_game)) current_state = GAME_STATE_PREGAME SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) @@ -424,7 +424,7 @@ SUBSYSTEM_DEF(ticker) if (living.client.prefs && living.client.prefs.auto_ooc) if (living.client.prefs.chat_toggles & CHAT_OOC) living.client.prefs.chat_toggles ^= CHAT_OOC - var/atom/movable/screen/splash/S = new(living.client, TRUE) + var/atom/movable/screen/splash/S = new(null, living.client, TRUE) S.Fade(TRUE) living.client.init_verbs() livings += living diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 1dbfb1540c..f307139406 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -60,7 +60,7 @@ SUBSYSTEM_DEF(title) for(var/thing in GLOB.clients) if(!thing) continue - var/atom/movable/screen/splash/S = new(thing, FALSE) + var/atom/movable/screen/splash/S = new(null, thing, FALSE) S.Fade(FALSE,FALSE) /datum/controller/subsystem/title/Recover() diff --git a/code/datums/action.dm b/code/datums/action.dm index e1e84c8f51..77d6b78917 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -948,20 +948,6 @@ icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "jetboot" -/datum/action/language_menu - name = "Language Menu" - desc = "Open the language menu to review your languages, their keys, and select your default language." - button_icon_state = "language_menu" - check_flags = 0 - -/datum/action/language_menu/Trigger() - if(!..()) - return FALSE - if(ismob(owner)) - var/mob/M = owner - var/datum/language_holder/H = M.get_language_holder() - H.open_language_menu(usr) - /datum/action/item_action/wheelys name = "Toggle Wheely-Heel's Wheels" desc = "Pops out or in your wheely-heel's wheels." diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index f5a46eb140..ec57e4b6c0 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -28,13 +28,13 @@ lose_text = "You suddenly remember how languages work." /datum/brain_trauma/severe/aphasia/on_gain() - owner.add_blocked_language(subtypesof(/datum/language/) - /datum/language/aphasia, LANGUAGE_APHASIA) - owner.grant_language(/datum/language/aphasia, TRUE, TRUE, LANGUAGE_APHASIA) + owner.add_blocked_language(subtypesof(/datum/language) - /datum/language/aphasia, LANGUAGE_APHASIA) + owner.grant_language(/datum/language/aphasia, source = LANGUAGE_APHASIA) ..() /datum/brain_trauma/severe/aphasia/on_lose() - owner.remove_blocked_language(subtypesof(/datum/language/), LANGUAGE_APHASIA) - owner.remove_language(/datum/language/aphasia, TRUE, TRUE, LANGUAGE_APHASIA) + owner.remove_blocked_language(subtypesof(/datum/language), LANGUAGE_APHASIA) + owner.remove_language(/datum/language/aphasia, LANGUAGE_APHASIA) ..() /datum/brain_trauma/severe/blindness diff --git a/code/datums/components/combat_mode.dm b/code/datums/components/combat_mode.dm index 6fd2b2e4a7..a71ac3799a 100644 --- a/code/datums/components/combat_mode.dm +++ b/code/datums/components/combat_mode.dm @@ -40,8 +40,7 @@ /// Creates the hud screen object. /datum/component/combat_mode/proc/on_mob_hud_created(mob/source) - hud_icon = new - hud_icon.hud = source.hud_used + hud_icon = new(null, source.hud_used) hud_icon.icon = tg_ui_icon_to_cit_ui(source.hud_used.ui_style) hud_icon.screen_loc = hud_loc source.hud_used.static_inventory += hud_icon diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index d32caeaea9..99ad2b4ede 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -4,11 +4,11 @@ /datum/component/personal_crafting/proc/create_mob_button(mob/user) var/datum/hud/H = user.hud_used - var/atom/movable/screen/craft/C = new() + var/atom/movable/screen/craft/C = new(null, H) C.icon = H.ui_style H.static_inventory += C user.client.screen += C - RegisterSignal(C, COMSIG_CLICK, PROC_REF(component_ui_interact)) + RegisterSignal(C, COMSIG_SCREEN_ELEMENT_CLICK, PROC_REF(component_ui_interact)) /datum/component/personal_crafting var/busy diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index e28e108677..06c114ca55 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -298,10 +298,10 @@ /datum/component/mood/proc/modify_hud(datum/source) var/mob/living/owner = parent var/datum/hud/hud = owner.hud_used - screen_obj = new + screen_obj = new(null, hud) hud.infodisplay += screen_obj RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(unmodify_hud)) - RegisterSignal(screen_obj, COMSIG_CLICK, PROC_REF(hud_click)) + RegisterSignal(screen_obj, COMSIG_SCREEN_ELEMENT_CLICK, PROC_REF(hud_click)) /datum/component/mood/proc/unmodify_hud(datum/source) if(!screen_obj || !parent) diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 9fa6ed5cc8..6cf3847ddc 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -63,7 +63,7 @@ Bonus if(scramble_language && !current_language) // Last part prevents rerolling language with small amounts of cure. current_language = pick(subtypesof(/datum/language) - /datum/language/common) H.add_blocked_language(subtypesof(/datum/language) - current_language, LANGUAGE_VOICECHANGE) - H.grant_language(current_language, TRUE, TRUE, LANGUAGE_VOICECHANGE) + H.grant_language(current_language, source = LANGUAGE_VOICECHANGE) /datum/symptom/voice_change/End(datum/disease/advance/A) ..() diff --git a/code/datums/dna.dm b/code/datums/dna.dm index ebec1017f7..cd1499935a 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -409,9 +409,7 @@ if(H.additional_language && H.additional_language != "None") var/language_entry = GLOB.roundstart_languages[H.additional_language] if(language_entry) - grant_language(language_entry, TRUE, TRUE) - - update_atom_languages() + grant_language(language_entry) /mob/living/carbon/human/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE) ..() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c05d04ede8..89429f2824 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -64,7 +64,6 @@ var/isholy = FALSE //is this person a chaplain or admin role allowed to use bibles var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems) - var/datum/language_holder/language_holder var/unconvertable = FALSE var/late_joiner = FALSE ///has this mind ever been an AI @@ -96,7 +95,6 @@ /datum/mind/Destroy() SSticker.minds -= src QDEL_LIST(antag_datums) - QDEL_NULL(language_holder) QDEL_NULL(skill_holder) set_current(null) soulOwner = null @@ -118,12 +116,6 @@ /datum/mind/proc/set_original_character(new_original_character) original_character = WEAKREF(new_original_character) -/datum/mind/proc/get_language_holder() - if(!language_holder) - language_holder = new (src) - - return language_holder - /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0) var/old_character = current var/signals = SEND_SIGNAL(new_character, COMSIG_MOB_PRE_PLAYER_CHANGE, new_character, old_character) | SEND_SIGNAL(src, COMSIG_PRE_MIND_TRANSFER, new_character, old_character) @@ -145,7 +137,19 @@ var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list var/mob/living/old_current = current if(current) - current.transfer_observers_to(new_character) //transfer anyone observing the old character to the new one + //transfer anyone observing the old character to the new one + current.transfer_observers_to(new_character) + + // Offload all mind languages from the old holder to a temp one + var/datum/language_holder/empty/temp_holder = new() + var/datum/language_holder/old_holder = old_current.get_language_holder() + var/datum/language_holder/new_holder = new_character.get_language_holder() + // Off load mind languages to the temp holder momentarily + new_holder.transfer_mind_languages(temp_holder) + // Transfer the old holder's mind languages to the new holder + old_holder.transfer_mind_languages(new_holder) + // And finally transfer the temp holder's mind languages back to the old holder + temp_holder.transfer_mind_languages(old_holder) set_current(new_character) //associate ourself with our new body new_character.mind = src //and associate our new body with ourself for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body @@ -162,7 +166,6 @@ if(new_character.client) LAZYCLEARLIST(new_character.client.recent_examines) new_character.client.init_verbs() // re-initialize character specific verbs - current.update_atom_languages() //CIT CHANGE - makes arousal update when transfering bodies if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs. diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 0eeb387a77..4559f39b00 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -277,10 +277,10 @@ /datum/mutation/human/stoner/on_acquiring(mob/living/carbon/human/owner) ..() - owner.grant_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER) + owner.grant_language(/datum/language/beachbum, source = LANGUAGE_STONER) owner.add_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER) /datum/mutation/human/stoner/on_losing(mob/living/carbon/human/owner) ..() - owner.remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER) + owner.remove_language(/datum/language/beachbum, source = LANGUAGE_STONER) owner.remove_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER) diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index cb0de6afd4..6c7abcd7bf 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -1,3 +1,6 @@ +/// Station traits displayed in the lobby +GLOBAL_LIST_EMPTY(lobby_station_traits) + ///Base class of station traits. These are used to influence rounds in one way or the other by influencing the levers of the station. /datum/station_trait ///Name of the trait @@ -22,26 +25,30 @@ var/trait_flags /// Whether or not this trait can be reverted by an admin var/can_revert = TRUE + /// If set to true we'll show a button on the lobby to notify people about this trait + var/sign_up_button = FALSE + /// Lobby buttons controlled by this trait + var/list/lobby_buttons = list() /datum/station_trait/New() . = ..() RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(on_round_start)) + if(sign_up_button) + GLOB.lobby_station_traits += src + if(SSstation.initialized) + SSstation.display_lobby_traits() if(trait_processes) START_PROCESSING(SSstation, src) if(trait_to_give) ADD_TRAIT(SSstation, trait_to_give, STATION_TRAIT) /datum/station_trait/Destroy() + destroy_lobby_buttons() SSstation.station_traits -= src return ..() -/// Proc ran when round starts. Use this for roundstart effects. -/datum/station_trait/proc/on_round_start() - SIGNAL_HANDLER - return - ///type of info the centcom report has on this trait, if any. /datum/station_trait/proc/get_report() return "[name] - [report_message]" @@ -55,3 +62,50 @@ REMOVE_TRAIT(SSstation, trait_to_give, STATION_TRAIT) qdel(src) + +/// Return TRUE if we want to show a lobby button, by default we assume we don't want it after the round begins +/datum/station_trait/proc/can_display_lobby_button(client/player) + return sign_up_button && !SSticker.HasRoundStarted() + +/// Apply any additional handling we need to our lobby button +/datum/station_trait/proc/setup_lobby_button(atom/movable/screen/lobby/button/sign_up/lobby_button) + SHOULD_CALL_PARENT(TRUE) + lobby_button.name = name + lobby_buttons |= lobby_button + RegisterSignal(lobby_button, COMSIG_ATOM_UPDATE_ICON, PROC_REF(on_lobby_button_update_icon)) + RegisterSignal(lobby_button, COMSIG_SCREEN_ELEMENT_CLICK, PROC_REF(on_lobby_button_click)) + RegisterSignal(lobby_button, COMSIG_PARENT_QDELETING, PROC_REF(on_lobby_button_destroyed)) + lobby_button.update_appearance(UPDATE_ICON) + +/// Called when our lobby button is clicked on +/datum/station_trait/proc/on_lobby_button_click(atom/movable/screen/lobby/button/sign_up/lobby_button, location, control, params, mob/dead/new_player/user) + SIGNAL_HANDLER + return + +/// Called when our lobby button tries to update its appearance +/datum/station_trait/proc/on_lobby_button_update_icon(atom/movable/screen/lobby/button/sign_up/lobby_button, updates) + SIGNAL_HANDLER + return + +/// Don't hold references to deleted buttons +/datum/station_trait/proc/on_lobby_button_destroyed(atom/movable/screen/lobby/button/sign_up/lobby_button) + SIGNAL_HANDLER + lobby_buttons -= lobby_button + +/// Proc ran when round starts. Use this for roundstart effects. By default we clean up our buttons here. +/datum/station_trait/proc/on_round_start() + SIGNAL_HANDLER + destroy_lobby_buttons() + +/// Remove all of our active lobby buttons +/datum/station_trait/proc/destroy_lobby_buttons() + for (var/atom/movable/screen/button as anything in lobby_buttons) + var/mob/dead/new_player/hud_owner = button.get_mob() + if (QDELETED(hud_owner)) + qdel(button) + continue + var/datum/hud/new_player/using_hud = hud_owner.hud_used + if(!using_hud) + qdel(button) + continue + using_hud.remove_station_trait_button(src) diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 09be52d700..528d9a5893 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -152,9 +152,7 @@ . = ..() //All bots that exist round start have their set language randomized. for(var/mob/living/simple_animal/bot/found_bot in GLOB.alive_mob_list) - /// The bot's language holder - so we can randomize and change their language - var/datum/language_holder/bot_languages = found_bot.get_language_holder() - bot_languages.selected_language = bot_languages.get_random_spoken_language() + found_bot.set_active_language(found_bot.get_random_spoken_language()) /datum/station_trait/revenge_of_pun_pun name = "Revenge of Pun Pun" diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 5bd653556c..789de2ef37 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -975,14 +975,16 @@ /atom/movable/screen/alert/status_effect/strandling/Click(location, control, params) . = ..() - if(usr != owner) + if(!.) return to_chat(owner, "You attempt to remove the durathread strand from around your neck.") - if(do_after(owner, 3.5 SECONDS, owner)) - if(isliving(owner)) - var/mob/living/L = owner - to_chat(owner, "You successfully remove the durathread strand.") - L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) + if(!do_after(owner, 3.5 SECONDS, owner)) + return + if(!isliving(owner)) + return + var/mob/living/L = owner + to_chat(owner, "You successfully remove the durathread strand.") + L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) /datum/status_effect/pacify diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index f8a51d2ad2..12bc58d70f 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -105,6 +105,9 @@ clickable_glow = TRUE /atom/movable/screen/alert/status_effect/wound/Click() + . = ..() + if(!.) + return var/mob/living/carbon/C = usr C.check_self_for_injuries() diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 154b735c02..62803206d4 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -124,7 +124,7 @@ for(var/mob/dead/observer/O in GLOB.player_list) if(O.key == expected_key) if(O.client?.address == addr) - new /atom/movable/screen/splash(O.client, TRUE) + new /atom/movable/screen/splash(null, O.client, TRUE) break /datum/world_topic/adminmsg diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index b672d79024..df751a114a 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -12,8 +12,11 @@ var/throw_speed = 2 //How many tiles to move per ds when being thrown. Float values are fully supported var/throw_range = 7 var/mob/pulledby = null + /// What language holder type to init as var/initial_language_holder = /datum/language_holder - var/datum/language_holder/language_holder // Mindless mobs and objects need language too, some times. Mind holder takes prescedence. + /// Holds all languages this mob can speak and understand + VAR_PRIVATE/datum/language_holder/language_holder + var/verb_say = "says" var/verb_ask = "asks" var/verb_exclaim = "exclaims" @@ -657,44 +660,36 @@ return language_holder /// Grants the supplied language and sets omnitongue true. -/atom/movable/proc/grant_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_ATOM) - var/datum/language_holder/LH = get_language_holder() - return LH.grant_language(language, understood, spoken, source) +/atom/movable/proc/grant_language(language, language_flags = ALL, source = LANGUAGE_ATOM) + return get_language_holder().grant_language(language, language_flags, source) /// Grants every language. -/atom/movable/proc/grant_all_languages(understood = TRUE, spoken = TRUE, grant_omnitongue = TRUE, source = LANGUAGE_MIND) - var/datum/language_holder/LH = get_language_holder() - return LH.grant_all_languages(understood, spoken, grant_omnitongue, source) +/atom/movable/proc/grant_all_languages(language_flags = ALL, grant_omnitongue = TRUE, source = LANGUAGE_MIND) + return get_language_holder().grant_all_languages(language_flags, grant_omnitongue, source) /// Removes a single language. -/atom/movable/proc/remove_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_ALL) - var/datum/language_holder/LH = get_language_holder() - return LH.remove_language(language, understood, spoken, source) +/atom/movable/proc/remove_language(language, language_flags = ALL, source = LANGUAGE_ALL) + return get_language_holder().remove_language(language, language_flags, source) /// Removes every language and sets omnitongue false. /atom/movable/proc/remove_all_languages(source = LANGUAGE_ALL, remove_omnitongue = FALSE) - var/datum/language_holder/LH = get_language_holder() - return LH.remove_all_languages(source, remove_omnitongue) + return get_language_holder().remove_all_languages(source, remove_omnitongue) /// Adds a language to the blocked language list. Use this over remove_language in cases where you will give languages back later. /atom/movable/proc/add_blocked_language(language, source = LANGUAGE_ATOM) - var/datum/language_holder/LH = get_language_holder() - return LH.add_blocked_language(language, source) + return get_language_holder().add_blocked_language(language, source) /// Removes a language from the blocked language list. /atom/movable/proc/remove_blocked_language(language, source = LANGUAGE_ATOM) - var/datum/language_holder/LH = get_language_holder() - return LH.remove_blocked_language(language, source) + return get_language_holder().remove_blocked_language(language, source) /// Checks if atom has the language. If spoken is true, only checks if atom can speak the language. -/atom/movable/proc/has_language(language, spoken = FALSE) - var/datum/language_holder/LH = get_language_holder() - return LH.has_language(language, spoken) +/atom/movable/proc/has_language(language, flags_to_check) + return get_language_holder().has_language(language, flags_to_check) /// Checks if atom can speak the language. /atom/movable/proc/can_speak_language(language) - var/datum/language_holder/LH = get_language_holder() - return LH.can_speak_language(language) + return get_language_holder().can_speak_language(language) /// Returns the result of tongue specific limitations on spoken languages. /atom/movable/proc/could_speak_language(language) @@ -702,33 +697,32 @@ /// Returns selected language, if it can be spoken, or finds, sets and returns a new selected language if possible. /atom/movable/proc/get_selected_language() - var/datum/language_holder/LH = get_language_holder() - return LH.get_selected_language() + return get_language_holder().get_selected_language() /// Gets a random understood language, useful for hallucinations and such. /atom/movable/proc/get_random_understood_language() - var/datum/language_holder/LH = get_language_holder() - return LH.get_random_understood_language() + return get_language_holder().get_random_understood_language() /// Gets a random spoken language, useful for forced speech and such. /atom/movable/proc/get_random_spoken_language() - var/datum/language_holder/LH = get_language_holder() - return LH.get_random_spoken_language() + return get_language_holder().get_random_spoken_language() /// Copies all languages into the supplied atom/language holder. Source should be overridden when you /// do not want the language overwritten by later atom updates or want to avoid blocked languages. -/atom/movable/proc/copy_languages(from_holder, source_override) - if(isatom(from_holder)) +/atom/movable/proc/copy_languages(datum/language_holder/from_holder, source_override) + if(ismovable(from_holder)) var/atom/movable/thing = from_holder from_holder = thing.get_language_holder() - var/datum/language_holder/LH = get_language_holder() - return LH.copy_languages(from_holder, source_override) -/// Empties out the atom specific languages and updates them according to the current atoms language holder. -/// As a side effect, it also creates missing language holders in the process. -/atom/movable/proc/update_atom_languages() - var/datum/language_holder/LH = get_language_holder() - return LH.update_atom_languages(src) + return get_language_holder().copy_languages(from_holder, source_override) + +/// Sets the passed path as the active language +/// Returns the currently selected language if successful, if the language was not valid, returns null +/atom/movable/proc/set_active_language(language_path) + var/datum/language_holder/our_holder = get_language_holder() + our_holder.selected_language = language_path + + return our_holder.get_selected_language() // verifies its validity, returns it if successful. /// Sets the vocal bark for the atom, using the bark's ID /atom/movable/proc/set_bark(id) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index e4be50e19c..d20f3e4803 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -94,7 +94,7 @@ M.setDir(dir) buckled_mobs |= M M.update_mobility() - M.throw_alert("buckled", /atom/movable/screen/alert/restrained/buckled) + M.throw_alert("buckled", /atom/movable/screen/alert/buckled) post_buckle_mob(M) SEND_SIGNAL(src, COMSIG_MOVABLE_BUCKLE, M, force) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 5e533888f9..573d6b7d95 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -220,8 +220,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "department_sec" icon_state = "Security Officer" -/obj/effect/landmark/start/depsec/New() - ..() +/obj/effect/landmark/start/depsec/Initialize(mapload) + . = ..() GLOB.department_security_spawns += src /obj/effect/landmark/start/depsec/Destroy() @@ -246,7 +246,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon_state = "wiznerd_spawn" /obj/effect/landmark/start/wizard/Initialize(mapload) - ..() + . = ..() GLOB.wizardstart += loc return INITIALIZE_HINT_QDEL @@ -256,7 +256,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon_state = "snukeop_spawn" /obj/effect/landmark/start/nukeop/Initialize(mapload) - ..() + . = ..() GLOB.nukeop_start += loc return INITIALIZE_HINT_QDEL @@ -266,7 +266,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon_state = "snukeop_leader_spawn" /obj/effect/landmark/start/nukeop_leader/Initialize(mapload) - ..() + . = ..() GLOB.nukeop_leader_start += loc return INITIALIZE_HINT_QDEL @@ -278,7 +278,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) name = "New Player" /obj/effect/landmark/start/new_player/Initialize(mapload) - ..() + . = ..() GLOB.newplayer_start += loc return INITIALIZE_HINT_QDEL @@ -308,7 +308,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) name = "JoinLate" /obj/effect/landmark/latejoin/Initialize(mapload) - ..() + . = ..() SSjob.latejoin_trackers += loc return INITIALIZE_HINT_QDEL @@ -333,7 +333,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "xeno_spawn" /obj/effect/landmark/xeno_spawn/Initialize(mapload) - ..() + . = ..() GLOB.xeno_spawn += loc return INITIALIZE_HINT_QDEL @@ -343,7 +343,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "blob_start" /obj/effect/landmark/blobstart/Initialize(mapload) - ..() + . = ..() GLOB.blobstart += loc return INITIALIZE_HINT_QDEL @@ -352,7 +352,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "secequipment" /obj/effect/landmark/secequipment/Initialize(mapload) - ..() + . = ..() GLOB.secequipment += loc return INITIALIZE_HINT_QDEL @@ -361,7 +361,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "prisonwarp" /obj/effect/landmark/prisonwarp/Initialize(mapload) - ..() + . = ..() GLOB.prisonwarp += loc return INITIALIZE_HINT_QDEL @@ -370,7 +370,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "ert_spawn" /obj/effect/landmark/ert_spawn/Initialize(mapload) - ..() + . = ..() GLOB.emergencyresponseteamspawn += loc return INITIALIZE_HINT_QDEL @@ -379,7 +379,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "holding_facility" /obj/effect/landmark/holding_facility/Initialize(mapload) - ..() + . = ..() GLOB.holdingfacility += loc return INITIALIZE_HINT_QDEL @@ -388,7 +388,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "tdome_observer" /obj/effect/landmark/thunderdome/observe/Initialize(mapload) - ..() + . = ..() GLOB.tdomeobserve += loc return INITIALIZE_HINT_QDEL @@ -397,7 +397,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "tdome_t1" /obj/effect/landmark/thunderdome/one/Initialize(mapload) - ..() + . = ..() GLOB.tdome1 += loc return INITIALIZE_HINT_QDEL @@ -406,7 +406,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "tdome_t2" /obj/effect/landmark/thunderdome/two/Initialize(mapload) - ..() + . = ..() GLOB.tdome2 += loc return INITIALIZE_HINT_QDEL @@ -415,7 +415,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "tdome_admin" /obj/effect/landmark/thunderdome/admin/Initialize(mapload) - ..() + . = ..() GLOB.tdomeadmin += loc return INITIALIZE_HINT_QDEL @@ -426,7 +426,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) layer = MOB_LAYER /obj/effect/landmark/servant_of_ratvar/Initialize(mapload) - ..() + . = ..() GLOB.servant_spawns += loc return INITIALIZE_HINT_QDEL @@ -436,7 +436,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) icon_state = "city_of_cogs" /obj/effect/landmark/city_of_cogs/Initialize(mapload) - ..() + . = ..() GLOB.city_of_cogs_spawns += loc return INITIALIZE_HINT_QDEL @@ -448,7 +448,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/event_spawn/New() - ..() + . = ..() GLOB.generic_event_spawns += src /obj/effect/landmark/event_spawn/Destroy() @@ -458,9 +458,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/ruin var/datum/map_template/ruin/ruin_template -/obj/effect/landmark/ruin/New(loc, my_ruin_template) +/obj/effect/landmark/ruin/Initialize(mapload, my_ruin_template) + . = ..() name = "ruin_[GLOB.ruin_landmarks.len + 1]" - ..(loc) ruin_template = my_ruin_template GLOB.ruin_landmarks |= src @@ -475,8 +475,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) layer = BULLET_HOLE_LAYER plane = ABOVE_WALL_PLANE -/obj/effect/landmark/stationroom/New() - ..() +/obj/effect/landmark/stationroom/Initialize(mapload) + . = ..() GLOB.stationroom_landmarks += src /obj/effect/landmark/stationroom/Destroy() @@ -514,7 +514,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3) icon = 'icons/rooms/box/engine.dmi' -/obj/effect/landmark/stationroom/box/engine/New() +/obj/effect/landmark/stationroom/box/engine/Initialize(mapload) . = ..() templates = CONFIG_GET(keyed_list/box_random_engine) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3f64be4729..5db6aead98 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -399,8 +399,8 @@ var/emp_cur_charges = 4 var/charge_tick = 0 -/obj/item/flashlight/emp/New() - ..() +/obj/item/flashlight/emp/Initialize(mapload) + . = ..() START_PROCESSING(SSobj, src) /obj/item/flashlight/emp/Destroy() diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm index 1172b50377..9976848bdf 100644 --- a/code/game/objects/items/documents.dm +++ b/code/game/objects/items/documents.dm @@ -37,8 +37,8 @@ var/forgedseal = 0 var/copy_type = null -/obj/item/documents/photocopy/New(loc, obj/item/documents/copy=null) - ..() +/obj/item/documents/photocopy/Initialize(mapload, obj/item/documents/copy=null) + . = ..() if(copy) copy_type = copy.type if(istype(copy, /obj/item/documents/photocopy)) // Copy Of A Copy Of A Copy diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index bac3851837..7a80ae2aca 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -522,7 +522,6 @@ S.ckey = C.ckey S.status_flags |= GODMODE S.copy_languages(user, LANGUAGE_MASTER) //Make sure the sword can understand and communicate with the user. - S.update_atom_languages() grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue S.AddElement(/datum/element/ghost_role_eligibility,penalize_on_ghost = TRUE) START_PROCESSING(SSprocessing,src) diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index ec7db22cf0..280922364d 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -17,8 +17,8 @@ var/fuel_added = 0 var/flame_expiry_timer -/obj/structure/fireplace/New() - ..() +/obj/structure/fireplace/Initialize(mapload) + . = ..() START_PROCESSING(SSobj, src) /obj/structure/fireplace/Destroy() diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 1752009506..c8fea2de4a 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -32,7 +32,7 @@ new_spawn.undershirt = "Nude" //changing underwear/shirt/socks doesn't seem to function correctly right now because of some bug elsewhere? new_spawn.socks = "Nude" new_spawn.update_body(TRUE) - new_spawn.language_holder.selected_language = /datum/language/sylvan + new_spawn.set_active_language(/datum/language/sylvan) //Ash walker eggs: Spawns in ash walker dens in lavaland. Ghosts become unbreathing lizards that worship the Necropolis and are advised to retrieve corpses to create more ash walkers. diff --git a/code/game/objects/structures/industrial_lift.dm b/code/game/objects/structures/industrial_lift.dm index 9f04d1b710..cff9e8e2a1 100644 --- a/code/game/objects/structures/industrial_lift.dm +++ b/code/game/objects/structures/industrial_lift.dm @@ -154,12 +154,9 @@ GLOBAL_LIST_EMPTY(lifts) var/list/atom/movable/lift_load //things to move var/datum/lift_master/lift_master_datum //control from -/obj/structure/industrial_lift/New() - GLOB.lifts.Add(src) - ..() - /obj/structure/industrial_lift/Initialize(mapload) . = ..() + GLOB.lifts.Add(src) RegisterSignal(src, COMSIG_MOVABLE_CROSSED, PROC_REF(AddItemOnLift)) RegisterSignal(loc, COMSIG_ATOM_CREATED, PROC_REF(AddItemOnLift))//For atoms created on platform RegisterSignal(src, COMSIG_MOVABLE_UNCROSSED, PROC_REF(RemoveItemFromLift)) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index ffb48ce633..1acfc16962 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -118,23 +118,23 @@ var/list/races_blacklist = list("skeleton", "agent", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie") var/list/choosable_races = list() -/obj/structure/mirror/magic/New() +/obj/structure/mirror/magic/Initialize(mapload) + . = ..() if(!choosable_races.len) for(var/speciestype in subtypesof(/datum/species)) var/datum/species/S = new speciestype() if(!(S.id in races_blacklist)) choosable_races += S.id - ..() -/obj/structure/mirror/magic/lesser/New() +/obj/structure/mirror/magic/lesser/Initialize(mapload) choosable_races = GLOB.roundstart_races.Copy() - ..() + return ..() -/obj/structure/mirror/magic/badmin/New() +/obj/structure/mirror/magic/badmin/Initialize(mapload) for(var/speciestype in subtypesof(/datum/species)) var/datum/species/S = new speciestype() choosable_races += S.id - ..() + return ..() /obj/structure/mirror/magic/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(!ishuman(user)) diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index be87c97759..0e7515b273 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -15,8 +15,8 @@ var/enter_delay = 0 var/const/time_to_unwrench = 2 SECONDS -/obj/structure/transit_tube/New(loc, newdirection) - ..(loc) +/obj/structure/transit_tube/Initialize(mapload, newdirection) + . = ..() if(newdirection) setDir(newdirection) init_tube_dirs() diff --git a/code/game/sound.dm b/code/game/sound.dm index a99d9aeaa9..9412f4f788 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -232,6 +232,10 @@ distance_multiplier - Can be used to multiply the distance at which the sound is /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. +///get_rand_frequency but lower range. +/proc/get_rand_frequency_low_range() + return rand(38000, 45000) + /proc/get_sfx(soundin) if(istext(soundin)) switch(soundin) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c1bf537dd8..90573b44a0 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2081,8 +2081,7 @@ if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob.") return - var/datum/language_holder/H = M.get_language_holder() - H.open_language_menu(usr) + M.get_language_holder().open_language_menu(usr) else if(href_list["traitor"]) if(!check_rights(R_ADMIN)) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 4aba4fda00..cb568beb52 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -135,9 +135,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /obj/effect/statclick/ticket_list var/current_state -/obj/effect/statclick/ticket_list/New(loc, name, state) +/obj/effect/statclick/ticket_list/Initialize(mapload, name, state) + . = ..() current_state = state - ..() /obj/effect/statclick/ticket_list/Click() GLOB.ahelp_tickets.BrowseTickets(current_state) diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm index 36732d5fe0..f98bb403bc 100644 --- a/code/modules/antagonists/abductor/equipment/glands/slime.dm +++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm @@ -10,12 +10,12 @@ /obj/item/organ/heart/gland/slime/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) ..() owner.faction |= "slime" - owner.grant_language(/datum/language/slime, TRUE, TRUE, LANGUAGE_GLAND) + owner.grant_language(/datum/language/slime, source = LANGUAGE_GLAND) /obj/item/organ/heart/gland/slime/Remove(mob/living/carbon/M, special = 0) ..() owner.faction -= "slime" - owner.remove_language(/datum/language/slime, TRUE, TRUE, LANGUAGE_GLAND) + owner.remove_language(/datum/language/slime, source = LANGUAGE_GLAND) /obj/item/organ/heart/gland/slime/activate() to_chat(owner, "You feel nauseated!") diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index 56ebb8fd87..46c4e260e3 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -210,7 +210,7 @@ // Physiology CheckVampOrgans() // Heart, Eyes // Language - owner.current.grant_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER) + owner.current.grant_language(/datum/language/vampiric, source = LANGUAGE_BLOODSUCKER) owner.hasSoul = FALSE // If false, renders the character unable to sell their soul. owner.isholy = FALSE // is this person a chaplain or admin role allowed to use bibles // Disabilities diff --git a/code/modules/antagonists/bloodsucker/datum_vassal.dm b/code/modules/antagonists/bloodsucker/datum_vassal.dm index 9a2e3a1ae6..3275f251a5 100644 --- a/code/modules/antagonists/bloodsucker/datum_vassal.dm +++ b/code/modules/antagonists/bloodsucker/datum_vassal.dm @@ -48,7 +48,7 @@ objectives += vassal_objective objectives_given += vassal_objective give_thrall_eyes() - owner.current.grant_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_VASSAL) + owner.current.grant_language(/datum/language/vampiric, source = LANGUAGE_VASSAL) // Add Antag HUD update_vassal_icons_added(owner.current, "vassal") . = ..() diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 5a6a6af90b..0ed599c824 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -84,7 +84,7 @@ create_initial_profile() if(give_objectives) forge_objectives() - owner.current.grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue. We are able to transform our body after all. + owner.current.get_language_holder().omnitongue = TRUE remove_clownmut() . = ..() diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index ed2982f861..f052afc4b4 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -96,7 +96,7 @@ current = mob_override GLOB.all_clockwork_mobs += current current.faction |= "ratvar" - current.grant_language(/datum/language/ratvar, TRUE, TRUE, LANGUAGE_CLOCKIE) + current.grant_language(/datum/language/ratvar, source = LANGUAGE_CLOCKIE) current.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them for whatever reason, we need to update buttons if(issilicon(current)) var/mob/living/silicon/S = current diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 63b82f26ce..fe9f8cbe04 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -121,7 +121,7 @@ if(mob_override) current = mob_override current.faction |= "cult" - current.grant_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST) + current.grant_language(/datum/language/narsie, source = LANGUAGE_CULTIST) if(!cult_team?.cult_master) vote.Grant(current) communion.Grant(current) @@ -139,7 +139,7 @@ if(mob_override) current = mob_override current.faction -= "cult" - current.remove_language(/datum/language/narsie, TRUE, TRUE, LANGUAGE_CULTIST) + current.remove_language(/datum/language/narsie, source = LANGUAGE_CULTIST) vote.Remove(current) communion.Remove(current) magic.Remove(current) diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index a8e57ee08b..7f45c5099c 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -182,9 +182,8 @@ add_antag_hud(antag_hud_type, antag_hud_name, M) if(M.hud_used) var/datum/hud/H = M.hud_used - var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted() + var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted(null, H) H.wanted_lvl = giving_wanted_lvl - giving_wanted_lvl.hud = H H.infodisplay += giving_wanted_lvl H.mymob.client.screen += giving_wanted_lvl diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index e41c7b1228..058379d96c 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -113,9 +113,8 @@ add_antag_hud(antag_hud_type, antag_hud_name, M) if(M.hud_used) var/datum/hud/H = M.hud_used - var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted() + var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted(null, H) H.wanted_lvl = giving_wanted_lvl - giving_wanted_lvl.hud = H H.infodisplay += giving_wanted_lvl H.mymob.client.screen += giving_wanted_lvl diff --git a/code/modules/antagonists/traitor/classes/ai.dm b/code/modules/antagonists/traitor/classes/ai.dm index 0c1709ee53..8992c9ea17 100644 --- a/code/modules/antagonists/traitor/classes/ai.dm +++ b/code/modules/antagonists/traitor/classes/ai.dm @@ -65,5 +65,5 @@ /datum/traitor_class/ai/finalize_traitor(datum/antagonist/traitor/T) T.add_law_zero() T.owner.current.playsound_local(get_turf(T.owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE) - T.owner.current.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MALF) + T.owner.current.grant_language(/datum/language/codespeak, source = LANGUAGE_MALF) return FALSE diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 99e69e1fa1..4eab67ea34 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -41,13 +41,13 @@ var/spawn_amt_left = 20 var/spawn_fast = 0 -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) +/obj/effect/rend/Initialize(mapload, spawn_type, spawn_amt, desc, spawn_fast) + . = ..() src.spawn_path = spawn_type src.spawn_amt_left = spawn_amt src.desc = desc src.spawn_fast = spawn_fast START_PROCESSING(SSobj, src) - return /obj/effect/rend/process() if(!spawn_fast) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index fe9770e64a..cff5260463 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -287,9 +287,7 @@ S.real_name = "Shade of [T.real_name]" T.transfer_ckey(S) S.original_mind = T.mind - S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder. - S.update_atom_languages() - grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue + S.get_language_holder().omnitongue = TRUE //Grants omnitongue if(user) S.faction |= "[REF(user)]" //Add the master as a faction, allowing inter-mob cooperation if(user && iscultist(user)) diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm index 0318e06abe..9c6a533646 100644 --- a/code/modules/atmospherics/gasmixtures/auxgm.dm +++ b/code/modules/atmospherics/gasmixtures/auxgm.dm @@ -186,6 +186,6 @@ GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new) appearance_flags = TILE_BOUND vis_flags = NONE -/obj/effect/overlay/gas/New(state) +/obj/effect/overlay/gas/Initialize(mapload, state) . = ..() icon_state = state diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 4eb836dab5..aab2d1ec1a 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -169,6 +169,15 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Only 10 bucks for 3 months! Click Here to find out more.") return FALSE return TRUE + +/client/proc/is_localhost() + var/static/localhost_addresses = list( + "127.0.0.1", + "::1", + null, + ) + return address in localhost_addresses + /* * Call back proc that should be checked in all paths where a client can send messages * diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2f1234f46d..f38721671c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -3487,7 +3487,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/language_entry = GLOB.roundstart_languages[additional_language] if(language_entry) character.additional_language = language_entry - character.grant_language(language_entry, TRUE, TRUE) + character.grant_language(language_entry) character.set_bark(bark_id) character.vocal_speed = bark_speed diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 8cccaba68b..d3a9172b96 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -55,7 +55,7 @@ SG.transfer_ckey(SA, FALSE) - SA.grant_all_languages(TRUE, FALSE, FALSE) + SA.grant_all_languages(UNDERSTOOD_LANGUAGE, grant_omnitongue = FALSE, source = LANGUAGE_ATOM) SA.sentience_act() diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 6b5707d76f..a4dbb20c5c 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -50,4 +50,5 @@ if(visualsOnly) return - H.grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_CURATOR) + H.grant_all_languages(source = LANGUAGE_CURATOR) + H.remove_blocked_language(GLOB.all_languages, source=LANGUAGE_ALL) diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm index 5d658b1fce..a051422726 100644 --- a/code/modules/language/codespeak.dm +++ b/code/modules/language/codespeak.dm @@ -46,7 +46,7 @@ return to_chat(user, "You start skimming through [src], and suddenly your mind is filled with codewords and responses.") - user.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) + user.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) use_charge(user) @@ -65,7 +65,7 @@ M.visible_message("[user] beats [M] over the head with [src]!", "[user] beats you over the head with [src]!", "You hear smacking.") else M.visible_message("[user] teaches [M] by beating [M.p_them()] over the head with [src]!", "As [user] hits you with [src], codewords and responses flow through your mind.", "You hear smacking.") - M.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) + M.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND) use_charge(user) /obj/item/codespeak_manual/proc/use_charge(mob/user) diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 2ad1bb762b..1c08540e31 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -1,23 +1,28 @@ -/*!Language holders will either exist in an atom/movable or a mind. Creation of language holders happens +/*!Language holders will either exist in an atom/movable. Creation of language holders happens automatically when they are needed, for example when something tries to speak. Where a mind is available, the mind language holder will be the one "in charge". The mind holder will update its languages based on the atom holder, and will get updated as part of transformations and other events that cause new languages to become available. + Every language holder has three lists of languages (and sources for each of them): - understood_languages - spoken_languages - blocked_languages + Understood languages let you understand them, spoken languages lets you speak them (if your tongue is compatible), and blocked languages will let you do neither no matter what the source of the language is. + Language holders are designed to mostly only ever require the use the helpers in atom/movable to achieve your goals, but it is also possible to work on them directly if needed. Any adding and removing of languages and sources should only happen through the procs, as directly changing these will mess something up somewhere down the line. + All atom movables have the initial_language_holder var which allows you to set the default language holder to create. For example, /datum/language_holder/alien will give you xenocommon and a block for galactic common. Human species also have a default language holder var that will be updated on species change, initial_species_holder. + Key procs * [grant_language](atom/movable.html#proc/grant_language) * [remove_language](atom/movable.html#proc/remove_language) @@ -28,83 +33,86 @@ Key procs * [has_language](atom/movable.html#proc/has_language) * [can_speak_language](atom/movable.html#proc/can_speak_language) * [get_selected_language](atom/movable.html#proc/get_selected_language) -* [update_atom_languages](atom/movable.html#proc/update_atom_languages) */ /datum/language_holder - /// Understood languages. - var/list/understood_languages = list(/datum/language/common = list(LANGUAGE_MIND)) - /// A list of languages that can be spoken. Tongue organ may also set limits beyond this list. + /// Lazyassoclist of all understood languages + var/list/understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) + /// Lazyassoclist of languages that can be spoken. + /// Tongue organ may also set limits beyond this list. var/list/spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) - /// A list of blocked languages. Used to prevent understanding and speaking certain languages, ie for certain mobs, mutations etc. - var/list/blocked_languages = list() - /// If true, overrides tongue limitations. + /// Lazyassoclist of blocked languages. + /// Used to prevent understanding and speaking certain languages, ie for certain mobs, mutations etc. + var/list/blocked_languages + /// If true, overrides tongue aforementioned limitations. var/omnitongue = FALSE /// Handles displaying the language menu UI. var/datum/language_menu/language_menu /// Currently spoken language var/selected_language /// Tracks the entity that owns the holder. - var/owner + var/atom/movable/owner /// Initializes, and copies in the languages from the current atom if available. -/datum/language_holder/New(_owner) - owner = _owner - if(istype(owner, /datum/mind)) - var/datum/mind/M = owner - if(M.current) - update_atom_languages(M.current) - get_selected_language() +/datum/language_holder/New(atom/new_owner) + if(new_owner) + if(QDELETED(new_owner)) + CRASH("Langauge holder added to a qdeleting thing, what the fuck [text_ref(new_owner)]") + if(!ismovable(new_owner)) + CRASH("Language holder being added to a non-movable thing, this is invalid (was: [new_owner] / [new_owner.type])") + + owner = new_owner + + // If we have an owner, we'll set a default selected language + if(owner) + get_selected_language() /datum/language_holder/Destroy() QDEL_NULL(language_menu) + owner = null return ..() /// Grants the supplied language. -/datum/language_holder/proc/grant_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_MIND) - if(understood) - if(!understood_languages[language]) - understood_languages[language] = list() - understood_languages[language] |= source +/datum/language_holder/proc/grant_language(language, language_flags = ALL, source = LANGUAGE_MIND) + if(language_flags & UNDERSTOOD_LANGUAGE) + LAZYORASSOCLIST(understood_languages, language, source) . = TRUE - if(spoken) - if(!spoken_languages[language]) - spoken_languages[language] = list() - spoken_languages[language] |= source + if(language_flags & SPOKEN_LANGUAGE) + LAZYORASSOCLIST(spoken_languages, language, source) . = TRUE + return . + /// Grants every language to understood and spoken, and gives omnitongue. -/datum/language_holder/proc/grant_all_languages(understood = TRUE, spoken = TRUE, grant_omnitongue = TRUE, source = LANGUAGE_MIND) +/datum/language_holder/proc/grant_all_languages(language_flags = ALL, grant_omnitongue = TRUE, source = LANGUAGE_MIND) for(var/language in GLOB.all_languages) - grant_language(language, understood, spoken, source) - if(grant_omnitongue) // Overrides tongue limitations. + grant_language(language, language_flags, source) + if(grant_omnitongue) // Overrides tongue limitations. omnitongue = TRUE return TRUE /// Removes a single language or source, removing all sources returns the pre-removal state of the language. -/datum/language_holder/proc/remove_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_ALL) - if(understood && understood_languages[language]) +/datum/language_holder/proc/remove_language(language, language_flags = ALL, source = LANGUAGE_ALL) + if(language_flags & UNDERSTOOD_LANGUAGE) if(source == LANGUAGE_ALL) - understood_languages -= language + LAZYREMOVE(understood_languages, language) else - understood_languages[language] -= source - if(!length(understood_languages[language])) - understood_languages -= language + LAZYREMOVEASSOC(understood_languages, language, source) . = TRUE - if(spoken && spoken_languages[language]) + if(language_flags & SPOKEN_LANGUAGE) if(source == LANGUAGE_ALL) - spoken_languages -= language + LAZYREMOVE(spoken_languages, language) else - spoken_languages[language] -= source - if(!length(spoken_languages[language])) - spoken_languages -= language + LAZYREMOVEASSOC(spoken_languages, language, source) . = TRUE + return . + /// Removes every language and optionally sets omnitongue false. If a non default source is supplied, only removes that source. /datum/language_holder/proc/remove_all_languages(source = LANGUAGE_ALL, remove_omnitongue = FALSE) for(var/language in GLOB.all_languages) - remove_language(language, TRUE, TRUE, source) + remove_language(language, ALL, source) if(remove_omnitongue) omnitongue = FALSE return TRUE @@ -113,41 +121,41 @@ Key procs /datum/language_holder/proc/add_blocked_language(languages, source = LANGUAGE_MIND) if(!islist(languages)) languages = list(languages) + for(var/language in languages) - if(!blocked_languages[language]) - blocked_languages[language] = list() - blocked_languages[language] |= source + LAZYORASSOCLIST(blocked_languages, language, source) return TRUE /// Removes a single language or list of languages from the blocked language list. /datum/language_holder/proc/remove_blocked_language(languages, source = LANGUAGE_MIND) if(!islist(languages)) languages = list(languages) + for(var/language in languages) - if(blocked_languages[language]) - if(source == LANGUAGE_ALL) - blocked_languages -= language - else - blocked_languages[language] -= source - if(!length(blocked_languages[language])) - blocked_languages -= language + if(source == LANGUAGE_ALL) + LAZYREMOVE(blocked_languages, language) + else + LAZYREMOVEASSOC(blocked_languages, language, source) + return TRUE -/// Checks if you have the language. If spoken is true, only checks if you can speak the language. -/datum/language_holder/proc/has_language(language, spoken = FALSE) +/// Checks if you have the language passed. +/datum/language_holder/proc/has_language(language, flag_to_check = UNDERSTOOD_LANGUAGE) if(language in blocked_languages) return FALSE - if(spoken) - return language in spoken_languages - return language in understood_languages + + var/list/langs_to_check = list() + if(flag_to_check & SPOKEN_LANGUAGE) + langs_to_check |= spoken_languages + if(flag_to_check & UNDERSTOOD_LANGUAGE) + langs_to_check |= understood_languages + + return language in langs_to_check /// Checks if you can speak the language. Tongue limitations should be supplied as an argument. /datum/language_holder/proc/can_speak_language(language) - var/atom/movable/ouratom = get_atom() - var/tongue = ouratom.could_speak_language(language) - if((omnitongue || tongue) && has_language(language, TRUE)) - return TRUE - return FALSE + var/can_speak_language_path = omnitongue || owner.could_speak_language(language) + return (can_speak_language_path && has_language(language, SPOKEN_LANGUAGE)) /// Returns selected language if it can be spoken, or decides, sets and returns a new selected language if possible. /datum/language_holder/proc/get_selected_language() @@ -172,59 +180,79 @@ Key procs /datum/language_holder/proc/get_random_spoken_language() return pick(spoken_languages) +/// Gets a random spoken language, trying to get a non-common language. +/datum/language_holder/proc/get_random_spoken_uncommon_language() + var/list/languages_minus_common = assoc_to_keys(spoken_languages) - /datum/language/common + + // They have a language other than common + if(length(languages_minus_common)) + return pick(languages_minus_common) + + // They can only speak common, oh well. + else + return /datum/language/common + /// Opens a language menu reading from the language holder. /datum/language_holder/proc/open_language_menu(mob/user) if(!language_menu) language_menu = new (src) language_menu.ui_interact(user) -/// Gets the atom, since we some times need to check if the tongue has limitations. -/datum/language_holder/proc/get_atom() - if(owner) - if(istype(owner, /datum/mind)) - var/datum/mind/M = owner - return M.current - return owner - return FALSE - -/// Empties out the atom specific languages and updates them according to the supplied atoms language holder. -/datum/language_holder/proc/update_atom_languages(atom/movable/thing) - var/datum/language_holder/from_atom = thing.get_language_holder(FALSE) //Gets the atoms language holder - if(from_atom == src) //This could happen if called on an atom without a mind. - return FALSE - for(var/language in understood_languages) - remove_language(language, TRUE, FALSE, LANGUAGE_ATOM) - for(var/language in spoken_languages) - remove_language(language, FALSE, TRUE, LANGUAGE_ATOM) - for(var/language in blocked_languages) - remove_blocked_language(language, LANGUAGE_ATOM) - - copy_languages(from_atom) - get_selected_language() - return TRUE - /// Copies all languages from the supplied atom/language holder. Source should be overridden when you /// do not want the language overwritten by later atom updates or want to avoid blocked languages. -/datum/language_holder/proc/copy_languages(var/datum/language_holder/from_holder, source_override) - if(source_override) //No blocked languages here, for now only used by ling absorb. +/datum/language_holder/proc/copy_languages(datum/language_holder/from_holder, source_override) + if(source_override) //No blocked languages here, for now only used by ling absorb. for(var/language in from_holder.understood_languages) - grant_language(language, TRUE, FALSE, source_override) + grant_language(language, UNDERSTOOD_LANGUAGE, source_override) for(var/language in from_holder.spoken_languages) - grant_language(language, FALSE, TRUE, source_override) + grant_language(language, SPOKEN_LANGUAGE, source_override) else for(var/language in from_holder.understood_languages) - grant_language(language, TRUE, FALSE, from_holder.understood_languages[language]) + grant_language(language, UNDERSTOOD_LANGUAGE, from_holder.understood_languages[language]) for(var/language in from_holder.spoken_languages) - grant_language(language, FALSE, TRUE, from_holder.spoken_languages[language]) + grant_language(language, SPOKEN_LANGUAGE, from_holder.spoken_languages[language]) for(var/language in from_holder.blocked_languages) add_blocked_language(language, from_holder.blocked_languages[language]) return TRUE +/// Transfers all mind languages to the supplied language holder. +/datum/language_holder/proc/transfer_mind_languages(datum/language_holder/to_holder) + for(var/language in understood_languages) + if(LANGUAGE_MIND in understood_languages[language]) + remove_language(language, UNDERSTOOD_LANGUAGE, LANGUAGE_MIND) + to_holder.grant_language(language, UNDERSTOOD_LANGUAGE, LANGUAGE_MIND) + for(var/language in spoken_languages) + if(LANGUAGE_MIND in spoken_languages[language]) + remove_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND) + to_holder.grant_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND) + for(var/language in blocked_languages) + if(LANGUAGE_MIND in blocked_languages[language]) + remove_blocked_language(language, LANGUAGE_MIND) + to_holder.add_blocked_language(language, LANGUAGE_MIND) -//************************************************ -//* Specific language holders * -//* Use atom language sources only. * -//************************************************/ + if(owner) + get_selected_language() + if(to_holder.owner) + to_holder.get_selected_language() + +/// A global assoc list containing prototypes of all language holders +/// [Language holder typepath] to [language holder instance] +/// Used for easy reference of what can speak what without needing to constantly recreate language holders. +GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes()) + +/// Inits the global list of language holder prototypes. +/proc/init_language_holder_prototypes() + var/list/prototypes = list() + for(var/holdertype in typesof(/datum/language_holder)) + prototypes[holdertype] = new holdertype() + + return prototypes + +/* + * Specific language holders presets + * + * Prefer to use [LANGUGAE_ATOM]. Atom languages will stick through species changes but not mindswaps. + */ /datum/language_holder/alien @@ -252,6 +280,10 @@ Key procs /datum/language_holder/drone/syndicate blocked_languages = null +/datum/language_holder/human_basic + understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) + spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) + /datum/language_holder/dwarf understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/dwarf = list(LANGUAGE_ATOM)) @@ -339,8 +371,12 @@ Key procs /datum/language/arachnid = list(LANGUAGE_ATOM)) /datum/language_holder/empty - understood_languages = list() - spoken_languages = list() + understood_languages = null + spoken_languages = null + +/datum/language_holder/universal + understood_languages = null + spoken_languages = null /datum/language_holder/universal/New() ..() diff --git a/code/modules/language/language_menu.dm b/code/modules/language/language_menu.dm index bffd3d59af..0bfb7a7997 100644 --- a/code/modules/language/language_menu.dm +++ b/code/modules/language/language_menu.dm @@ -20,109 +20,108 @@ /datum/language_menu/ui_data(mob/user) var/list/data = list() - var/atom/movable/AM = language_holder.get_atom() - if(isliving(AM)) - data["is_living"] = TRUE - else - data["is_living"] = FALSE - + var/atom/movable/speaker = language_holder.owner + data["is_living"] = isliving(speaker) data["languages"] = list() - for(var/lang in GLOB.all_languages) - var/result = language_holder.has_language(lang) || language_holder.has_language(lang, TRUE) + for(var/datum/language/language as anything in GLOB.all_languages) + var/result = language_holder.has_language(language) || language_holder.has_language(language, SPOKEN_LANGUAGE) if(!result) continue - var/datum/language/language = lang - var/list/L = list() + var/list/lang_data = list() - L["name"] = initial(language.name) - L["desc"] = initial(language.desc) - L["key"] = initial(language.key) - L["is_default"] = (language == language_holder.selected_language) - if(AM) - L["can_speak"] = AM.can_speak_language(language) - L["can_understand"] = AM.has_language(language) + lang_data["name"] = initial(language.name) + lang_data["desc"] = initial(language.desc) + lang_data["key"] = initial(language.key) + lang_data["is_default"] = (language == language_holder.selected_language) + if(speaker) + lang_data["can_speak"] = speaker.can_speak_language(language) + lang_data["can_understand"] = speaker.has_language(language) - data["languages"] += list(L) + UNTYPED_LIST_ADD(data["languages"], lang_data) - if(check_rights_for(user.client, R_ADMIN) || isobserver(AM)) + if(check_rights_for(user.client, R_ADMIN) || isobserver(speaker)) data["admin_mode"] = TRUE data["omnitongue"] = language_holder.omnitongue - data["unknown_languages"] = list() - for(var/lang in GLOB.all_languages) - if(language_holder.has_language(lang) || language_holder.has_language(lang, TRUE)) + for(var/datum/language/language as anything in GLOB.all_languages) + if(language_holder.has_language(language) || language_holder.has_language(language, SPOKEN_LANGUAGE)) continue - var/datum/language/language = lang - var/list/L = list() + var/list/lang_data = list() - L["name"] = initial(language.name) - L["desc"] = initial(language.desc) - L["key"] = initial(language.key) + lang_data["name"] = initial(language.name) + lang_data["desc"] = initial(language.desc) + lang_data["key"] = initial(language.key) + + UNTYPED_LIST_ADD(data["unknown_languages"], lang_data) - data["unknown_languages"] += list(L) return data /datum/language_menu/ui_act(action, params) - if(..()) + . = ..() + if(.) return var/mob/user = usr - var/atom/movable/AM = language_holder.get_atom() - + var/atom/movable/speaker = language_holder.owner + var/is_admin = check_rights_for(user.client, R_ADMIN) var/language_name = params["language_name"] var/datum/language/language_datum - for(var/lang in GLOB.all_languages) - var/datum/language/language = lang + for(var/datum/language/language as anything in GLOB.all_languages) if(language_name == initial(language.name)) language_datum = language - var/is_admin = check_rights_for(user.client, R_ADMIN) switch(action) if("select_default") - if(language_datum && AM.can_speak_language(language_datum)) + if(language_datum && speaker.can_speak_language(language_datum)) language_holder.selected_language = language_datum . = TRUE if("grant_language") - if((is_admin || isobserver(AM)) && language_datum) + if((is_admin || isobserver(speaker)) && language_datum) var/list/choices = list("Only Spoken", "Only Understood", "Both") - var/choice = input(user,"How do you want to add this language?","[language_datum]",null) as null|anything in choices - var/spoken = FALSE - var/understood = FALSE + var/choice = tgui_input_list(user, "How do you want to add this language?", "[language_datum]", choices) + if(isnull(choice)) + return + var/adding_flags = NONE switch(choice) if("Only Spoken") - spoken = TRUE + adding_flags |= SPOKEN_LANGUAGE if("Only Understood") - understood = TRUE + adding_flags |= UNDERSTOOD_LANGUAGE if("Both") - spoken = TRUE - understood = TRUE - language_holder.grant_language(language_datum, understood, spoken) + adding_flags |= ALL + + if(LAZYACCESS(language_holder.blocked_languages, language_datum)) + choice = tgui_alert(user, "Do you want to lift the blockage that's also preventing the language to be spoken or understood?", "[language_datum]", list("Yes", "No")) + if(choice == "Yes") + language_holder.remove_blocked_language(language_datum, LANGUAGE_ALL) + language_holder.grant_language(language_datum, adding_flags) if(is_admin) - message_admins("[key_name_admin(user)] granted the [language_name] language to [key_name_admin(AM)].") - log_admin("[key_name(user)] granted the language [language_name] to [key_name(AM)].") + message_admins("[key_name_admin(user)] granted the [language_name] language to [key_name_admin(speaker)].") + log_admin("[key_name(user)] granted the language [language_name] to [key_name(speaker)].") . = TRUE if("remove_language") - if((is_admin || isobserver(AM)) && language_datum) + if((is_admin || isobserver(speaker)) && language_datum) var/list/choices = list("Only Spoken", "Only Understood", "Both") - var/choice = input(user,"Which part do you wish to remove?","[language_datum]",null) as null|anything in choices - var/spoken = FALSE - var/understood = FALSE + var/choice = tgui_input_list(user, "Which part do you wish to remove?", "[language_datum]", choices) + if(isnull(choice)) + return + var/removing_flags = NONE switch(choice) if("Only Spoken") - spoken = TRUE + removing_flags |= SPOKEN_LANGUAGE if("Only Understood") - understood = TRUE + removing_flags |= UNDERSTOOD_LANGUAGE if("Both") - spoken = TRUE - understood = TRUE - language_holder.remove_language(language_datum, understood, spoken) + removing_flags |= ALL + + language_holder.remove_language(language_datum, removing_flags) if(is_admin) - message_admins("[key_name_admin(user)] removed the [language_name] language to [key_name_admin(AM)].") - log_admin("[key_name(user)] removed the language [language_name] to [key_name(AM)].") + message_admins("[key_name_admin(user)] removed the [language_name] language to [key_name_admin(speaker)].") + log_admin("[key_name(user)] removed the language [language_name] to [key_name(speaker)].") . = TRUE if("toggle_omnitongue") - if(is_admin || isobserver(AM)) + if(is_admin || isobserver(speaker)) language_holder.omnitongue = !language_holder.omnitongue if(is_admin) - message_admins("[key_name_admin(user)] [language_holder.omnitongue ? "enabled" : "disabled"] the ability to speak all languages (that they know) of [key_name_admin(AM)].") - log_admin("[key_name(user)] [language_holder.omnitongue ? "enabled" : "disabled"] the ability to speak all languages (that_they know) of [key_name(AM)].") + message_admins("[key_name_admin(user)] [language_holder.omnitongue ? "enabled" : "disabled"] the ability to speak all languages (that they know) of [key_name_admin(speaker)].") + log_admin("[key_name(user)] [language_holder.omnitongue ? "enabled" : "disabled"] the ability to speak all languages (that_they know) of [key_name(speaker)].") . = TRUE diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index efc00159ea..0475b7075a 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -666,6 +666,7 @@ /obj/item/book_of_babel/attack_self(mob/user) to_chat(user, "You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.") user.grant_all_languages() + user.remove_blocked_language(GLOB.all_languages, source = LANGUAGE_ALL) new /obj/effect/decal/cleanable/ash(get_turf(user)) qdel(src) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index b455787e5c..f9631209f2 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -89,20 +89,20 @@ INITIALIZE_IMMEDIATE(/mob/dead) if(alert(src, "Jump to server [pick] ([addr])?", "Server Hop", "Yes", "No") != "Yes") return - var/client/C = client - to_chat(C, "Sending you to [pick].") - new /atom/movable/screen/splash(C) + var/client/hopper = client + to_chat(hopper, "Sending you to [pick].") + new /atom/movable/screen/splash(null, src, hopper, FALSE) mob_transforming = TRUE - sleep(29) //let the animation play + sleep(2.9 SECONDS) //let the animation play mob_transforming = FALSE - if(!C) + if(!hopper) return winset(src, null, "command=.options") //other wise the user never knows if byond is downloading resources - C << link("[addr]") + hopper << link("[addr]") /mob/dead/proc/update_z(new_z) // 1+ to register, null to unregister if (registered_z != new_z) diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index e40b467a79..2253e81814 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -41,7 +41,3 @@ else postfix = "soon" to_chat(src, "Please set up your character and select \"Ready\". The game will start [postfix].") - - var/datum/hud/new_player/NH = hud_used - if(istype(NH)) - NH.populate_buttons(src) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 330d9b36db..41f44d357a 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -27,7 +27,7 @@ /mob/dead/new_player/Initialize(mapload) if(client && SSticker.state == GAME_STATE_STARTUP) - var/atom/movable/screen/splash/S = new(client, TRUE, TRUE) + var/atom/movable/screen/splash/S = new(null, null, client, TRUE) S.Fade(TRUE) if(length(GLOB.newplayer_start)) @@ -491,7 +491,7 @@ if(job && !job.override_latejoin_spawn(character)) SSjob.SendToLateJoin(character) if(!arrivals_docked) - var/atom/movable/screen/splash/Spl = new(character.client, TRUE) + var/atom/movable/screen/splash/Spl = new(null, character, character.client, TRUE) Spl.Fade(TRUE) character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 6723d2d4a6..de3601aa20 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -6,6 +6,7 @@ can_buckle = TRUE buckle_lying = FALSE mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + initial_language_holder = /datum/language_holder/empty // We get stuff from our species /// Enable stamina combat combat_flags = COMBAT_FLAGS_STAMINA_COMBAT | COMBAT_FLAG_UNARMED_PARRY status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e1af109877..e50978e9c0 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -86,8 +86,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/dangerous_existence //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!" ///Affects the speech message, for example: Motharula flutters, "My speech message is flutters!" var/say_mod = "says" - ///What languages this species can understand and say. Use a [language holder datum][/datum/language_holder] in this var. - var/species_language_holder = /datum/language_holder + /// What languages this species can understand and say. + /// Use a [language holder datum][/datum/language_holder] typepath in this var. + /// Should never be null. + var/datum/language_holder/species_language_holder = /datum/language_holder/human_basic /** * Visible CURRENT bodyparts that are unique to a species. * DO NOT USE THIS AS A LIST OF ALL POSSIBLE BODYPARTS AS IT WILL FUCK @@ -544,6 +546,16 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) for(var/obj/item/bodypart/B in C.bodyparts) B.change_bodypart_status(BODYPART_HYBRID, FALSE, TRUE) // Makes all Bodyparts 'robotic'. + // All languages associated with this language holder are added with source [LANGUAGE_SPECIES] + // rather than source [LANGUAGE_ATOM], so we can track what to remove if our species changes again + var/datum/language_holder/gaining_holder = GLOB.prototype_language_holders[species_language_holder] + for(var/language in gaining_holder.understood_languages) + C.grant_language(language, UNDERSTOOD_LANGUAGE, LANGUAGE_SPECIES) + for(var/language in gaining_holder.spoken_languages) + C.grant_language(language, SPOKEN_LANGUAGE, LANGUAGE_SPECIES) + for(var/language in gaining_holder.blocked_languages) + C.add_blocked_language(language, LANGUAGE_SPECIES) + SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species) /datum/species/proc/update_species_slowdown(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index ec961da4dd..697e3a257f 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -34,11 +34,11 @@ /mob/living/carbon/human/set_drugginess(amount) ..() if(!amount) - remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH) + remove_language(/datum/language/beachbum, source = LANGUAGE_HIGH) /mob/living/carbon/human/adjust_drugginess(amount) ..() if(druggy) - grant_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH) + grant_language(/datum/language/beachbum, source = LANGUAGE_HIGH) else - remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH) + remove_language(/datum/language/beachbum, source = LANGUAGE_HIGH) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 35c8303aa1..bb72f6f9c0 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -486,8 +486,3 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/whisper(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) say("#[message]", bubble_type, spans, sanitize, language, ignore_spam, forced) - -/mob/living/get_language_holder(get_minds = TRUE) - if(get_minds && mind) - return mind.get_language_holder() - . = ..() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 26431ece5f..99c3eda3eb 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -139,13 +139,11 @@ var/datum/action/innate/pai/light/AL = new /datum/action/innate/pai/light var/datum/action/innate/custom_holoform/custom_holoform = new /datum/action/innate/custom_holoform - var/datum/action/language_menu/ALM = new SW.Grant(src) AS.Grant(src) AC.Grant(src) AR.Grant(src) AL.Grant(src) - ALM.Grant(src) custom_holoform.Grant(src) emitter_next_use = world.time + 10 SECONDS diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index ad7bc79278..38859a7a93 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -268,7 +268,7 @@ encryptmod = TRUE if("translator") if(href_list["toggle"]) //This is permanent. - grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_SOFTWARE) + grant_all_languages(source = LANGUAGE_SOFTWARE) if("doorjack") if(href_list["jack"]) if(cable && cable.machine) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 9f0596d3ea..a47cc1d181 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -24,9 +24,9 @@ robot_modules_background.layer = HUD_LAYER //Objects that appear on screen are on layer ABOVE_HUD_LAYER, UI should be just below it. robot_modules_background.plane = HUD_PLANE - inv1 = new /atom/movable/screen/robot/module1() - inv2 = new /atom/movable/screen/robot/module2() - inv3 = new /atom/movable/screen/robot/module3() + inv1 = new /atom/movable/screen/robot/module1(null, src) + inv2 = new /atom/movable/screen/robot/module2(null, src) + inv3 = new /atom/movable/screen/robot/module3(null, src) ident = rand(1, 999) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 8109301238..d700de554a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -954,12 +954,11 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) //Do not do parent's actions, as we *usually* do this differently. fully_replace_character_name(real_name, new_name) -/mob/verb/open_language_menu() +/mob/verb/open_language_menu_verb() set name = "Open Language Menu" set category = "IC" - var/datum/language_holder/H = get_language_holder() - H.open_language_menu(usr) + get_language_holder().open_language_menu(usr) ///Adjust the nutrition of a mob /mob/proc/adjust_nutrition(change, max = INFINITY) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 48faeafd48..9352d191dd 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -436,7 +436,6 @@ mind.transfer_to(new_xeno) else transfer_ckey(new_xeno) - update_atom_languages() to_chat(new_xeno, "You are now an alien.") . = new_xeno diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 5d46329462..977d210bc6 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -980,7 +980,6 @@ familiar.copy_languages(owner, LANGUAGE_MASTER) if(linked.saved_mind) linked.saved_mind.transfer_to(familiar) - familiar.update_atom_languages() familiar.ckey = linked.saved_mind.key else if(familiar.mind) diff --git a/code/modules/ruins/spaceruin_code/TheDerelict.dm b/code/modules/ruins/spaceruin_code/TheDerelict.dm index d26e023df0..cae5c53090 100644 --- a/code/modules/ruins/spaceruin_code/TheDerelict.dm +++ b/code/modules/ruins/spaceruin_code/TheDerelict.dm @@ -159,7 +159,7 @@ to_chat(user, "You start skimming through [src], but you already know dronespeak.") else to_chat(user, "You start skimming through [src], and suddenly the drone chittering makes sense.") - user.grant_language(/datum/language/drone, TRUE, TRUE)//, LANGUAGE_MIND) + user.grant_language(/datum/language/drone, source = LANGUAGE_MIND) return if(user.has_language(/datum/language/drone)) @@ -180,7 +180,7 @@ M.visible_message("[user] beats [M] over the head with [src]!", "[user] beats you over the head with [src]!", "You hear smacking.") else M.visible_message("[user] teaches [M] by beating [M.p_them()] over the head with [src]!", "As [user] hits you with [src], chitters resonate in your mind.", "You hear smacking.") - M.grant_language(/datum/language/drone, TRUE, TRUE) //, LANGUAGE_MIND) + M.grant_language(/datum/language/drone, source = LANGUAGE_MIND) return /obj/structure/fluff/oldturret diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm index eaaa125786..1786175f05 100644 --- a/code/modules/tgui/states/language_menu.dm +++ b/code/modules/tgui/states/language_menu.dm @@ -14,6 +14,6 @@ GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new) if(check_rights_for(user.client, R_ADMIN)) . = UI_INTERACTIVE else if(istype(src_object, /datum/language_menu)) - var/datum/language_menu/LM = src_object - if(LM.language_holder.get_atom() == user) + var/datum/language_menu/my_languages = src_object + if(my_languages.language_holder.owner == user) . = UI_INTERACTIVE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index c7f69fcaf1..d593f90423 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -67,6 +67,7 @@ // #include "holidays.dm" // #include "hydroponics_harvest.dm" // #include "keybinding_init.dm" +// #include "language_transfer.dm" #include "machine_disassembly.dm" #include "medical_wounds.dm" #include "merge_type.dm" diff --git a/code/modules/unit_tests/language_transfer.dm b/code/modules/unit_tests/language_transfer.dm new file mode 100644 index 0000000000..7e031f3a8b --- /dev/null +++ b/code/modules/unit_tests/language_transfer.dm @@ -0,0 +1,191 @@ +// Dedicated to testing language holders + +/// Simply tests that swapping to a new species gives you the languages of that species and removes the languages of the old species +/datum/unit_test/language_species_swap_simple + +/datum/unit_test/language_species_swap_simple/Run() + var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) + + var/datum/language_holder/holder = dummy.get_language_holder() + + var/list/initial_spoken = holder.spoken_languages.Copy() + var/list/initial_understood = holder.understood_languages.Copy() + + TEST_ASSERT(length(initial_spoken) == 1, \ + "Dummy should only speak one language! Instead, it knew the following: [print_language_list(initial_spoken)]") + TEST_ASSERT(length(initial_understood) == 1, \ + "Dummy should only understand one language! Instead, it knew the following: [print_language_list(initial_understood)]") + + dummy.set_species(/datum/species/lizard) + + TEST_ASSERT(length(holder.spoken_languages) == 2, \ + "Dummy should speak two languages - Common and Draconic! Instead, it knew the following: [print_language_list(holder.spoken_languages)]") + + TEST_ASSERT(length(holder.understood_languages) == 2, \ + "Dummy should understand two languages - Common and Draconic! Instead, it knew the following: [print_language_list(holder.understood_languages)]") + + dummy.set_species(/datum/species/human) + + TEST_ASSERT(length(initial_spoken & holder.spoken_languages) == 1, \ + "Dummy did not speak Common after returning to human! Instead, it knew the following: [print_language_list(holder.spoken_languages)]") + + TEST_ASSERT(length(initial_understood & holder.understood_languages) == 1, \ + "Dummy did not understand Common after returning to human! Instead, it knew the following: [print_language_list(holder.understood_languages)]") + +/// Tests species changes which are more complex are functional (e.g. from a species which speaks common to one which does not) +/datum/unit_test/language_species_swap_complex + +/datum/unit_test/language_species_swap_complex/Run() + var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) + + var/datum/language_holder/holder = dummy.get_language_holder() + + dummy.set_species(/datum/species/lizard/silverscale) + + TEST_ASSERT(!dummy.has_language(/datum/language/common, SPOKEN_LANGUAGE), \ + "Changing a mob's species from one which speaks common to one which does not should remove the language!") + + TEST_ASSERT(dummy.has_language(/datum/language/common, UNDERSTOOD_LANGUAGE), \ + "Changing a mob's species from one which understands common another which does should not remove the language!") + + TEST_ASSERT(length(holder.spoken_languages) == 2, \ + "Dummy should speak two languages - Uncommon and Draconic! Instead, it knew the following: [print_language_list(holder.spoken_languages)]") + + TEST_ASSERT(length(holder.understood_languages) == 3, \ + "Dummy should understand two languages - Common, Uncommon and Draconic! Instead, it knew the following: [print_language_list(holder.understood_languages)]") + +/// Test that other random languages known are not lost on species change +/datum/unit_test/language_species_change_other_known + +/datum/unit_test/language_species_change_other_known/Run() + var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) + dummy.grant_language(/datum/language/piratespeak, source = LANGUAGE_MIND) + dummy.grant_language(/datum/language/draconic, source = LANGUAGE_ATOM) + dummy.set_species(/datum/species/lizard) + + TEST_ASSERT(dummy.has_language(/datum/language/piratespeak, SPOKEN_LANGUAGE), \ + "Dummy should still speak Pirate after changing species, as it's a mind language!") + + TEST_ASSERT(dummy.has_language(/datum/language/piratespeak, UNDERSTOOD_LANGUAGE), \ + "Dummy should still understand Pirate after changing species, as it's a mind language!") + + dummy.set_species(/datum/species/human) + + TEST_ASSERT(dummy.has_language(/datum/language/draconic, SPOKEN_LANGUAGE), \ + "Dummy should still speak Draconic after changing species, as it's an atom language!") + + TEST_ASSERT(dummy.has_language(/datum/language/draconic, UNDERSTOOD_LANGUAGE), \ + "Dummy should still understand Draconic after changing species, as it's an atom language!") + +/// Tests that mind bound languages are not lost swapping into a new mob, but other languages are +/datum/unit_test/language_mind_transfer + +/datum/unit_test/language_mind_transfer/Run() + var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) + var/mob/living/basic/pet/dog/corgi/transfer_target = allocate(/mob/living/basic/pet/dog/corgi) + dummy.mind_initialize() + dummy.grant_language(/datum/language/piratespeak, source = LANGUAGE_MIND) + dummy.grant_language(/datum/language/draconic, source = LANGUAGE_ATOM) + dummy.set_species(/datum/species/lizard/silverscale) + + dummy.mind.transfer_to(transfer_target) + + // transfer_target should speak and understand pirate + TEST_ASSERT(!dummy.has_language(/datum/language/piratespeak, SPOKEN_LANGUAGE), \ + "Dummy should no longer be speaking Pirate after losing their mind!") + TEST_ASSERT(transfer_target.has_language(/datum/language/piratespeak, SPOKEN_LANGUAGE), \ + "Dummy's new mob should be capable of speaking Pirate!") + + TEST_ASSERT(!dummy.has_language(/datum/language/piratespeak, UNDERSTOOD_LANGUAGE), \ + "Dummy should no longer be understanding Pirate after losing their mind!") + TEST_ASSERT(transfer_target.has_language(/datum/language/piratespeak, UNDERSTOOD_LANGUAGE), \ + "Dummy's new mob should be capable of understanding Pirate!") + + // transfer_target should NOT speak and understand draconic + TEST_ASSERT(dummy.has_language(/datum/language/draconic, SPOKEN_LANGUAGE), \ + "Dummy should still understand Draconic after losing their mind - it's an atom language!") + TEST_ASSERT(!transfer_target.has_language(/datum/language/draconic, SPOKEN_LANGUAGE), \ + "Dummy's new mob should not understand Draconic - it's an atom language!") + + TEST_ASSERT(dummy.has_language(/datum/language/draconic, UNDERSTOOD_LANGUAGE), \ + "Dummy should still understand Draconic after losing their mind - it's an atom language!") + TEST_ASSERT(!transfer_target.has_language(/datum/language/draconic, UNDERSTOOD_LANGUAGE), \ + "Dummy's new mob should not understand Draconic - it's an atom language!") + + // transfer_target should NOT speak and understand uncommon + TEST_ASSERT(dummy.has_language(/datum/language/uncommon, SPOKEN_LANGUAGE), \ + "Dummy should still understand Uncommon after losing their mind - it's a species language!") + TEST_ASSERT(!transfer_target.has_language(/datum/language/uncommon, SPOKEN_LANGUAGE), \ + "Dummy's new mob should not understand Uncommon - it's a species language!") + + TEST_ASSERT(dummy.has_language(/datum/language/uncommon, UNDERSTOOD_LANGUAGE), \ + "Dummy should still understand Uncommon after losing their mind - it's a species language!") + TEST_ASSERT(!transfer_target.has_language(/datum/language/uncommon, UNDERSTOOD_LANGUAGE), \ + "Dummy's new mob should not understand Uncommon - it's a species language!") + +/// Tests that mind bound languages are not lost when swapping with another person (wiz mindswap) +/datum/unit_test/language_mind_swap + +/datum/unit_test/language_mind_swap/Run() + var/mob/living/carbon/human/dummy_A = allocate(/mob/living/carbon/human/consistent) + var/mob/living/carbon/human/dummy_B = allocate(/mob/living/carbon/human/consistent) + + dummy_A.mind_initialize() + dummy_B.mind_initialize() + + var/datum/mind/dummy_A_mind = dummy_A.mind + var/datum/mind/dummy_B_mind = dummy_B.mind + + dummy_A.set_species(/datum/species/lizard) + dummy_B.grant_language(/datum/language/piratespeak, source = LANGUAGE_MIND) + + dummy_A_mind.transfer_to(dummy_B) + dummy_B_mind.transfer_to(dummy_A) + + var/datum/language_holder/holder_A = dummy_A.get_language_holder() + var/datum/language_holder/holder_B = dummy_B.get_language_holder() + + // Holder A is a lizard: starts with 2 languages (common, draconic) + // Holder B is a human with a mind language: starts with 2 language (common, pirate) + // Swap occurs + // Holder A is a lizard with 2 languages, but should now also have pirate: 3 languages (common, draconic, pirate) + // Holder B is a human with just 1 language left over (common) + + TEST_ASSERT_EQUAL(length(holder_A.spoken_languages), 3, \ + "Holder A / Dummy A / Dummy B mind should speak Common, Draconic, and Pirate! \ + Instead, it knew the following: [print_language_list(holder_A.spoken_languages)]") + + TEST_ASSERT_EQUAL(length(holder_A.understood_languages), 3, \ + "Holder A / Dummy A / Dummy B mind should only understand Common, Draconic, and Pirate! \ + Instead, it knew the following: [print_language_list(holder_A.understood_languages)]") + + TEST_ASSERT_EQUAL(length(holder_B.spoken_languages), 1, \ + "Holder B / Dummy B / Dummy A mind should only speak 1 language - Common! \ + Instead, it knew the following: [print_language_list(holder_B.spoken_languages)]") + + TEST_ASSERT_EQUAL(length(holder_B.understood_languages), 1, \ + "Holder B / Dummy B / Dummy A mind only understand 1 language - Common! \ + Instead, it knew the following: [print_language_list(holder_B.understood_languages)]") + +/// Tests that the book of babel, and by extension grant_all_languages, works as intended +/datum/unit_test/book_of_babel + +/datum/unit_test/book_of_babel/Run() + var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) + var/obj/item/book_of_babel/book = allocate(/obj/item/book_of_babel) + var/datum/language_holder/holder = dummy.get_language_holder() + var/expected_amount = length(GLOB.all_languages) + + book.attack_self(dummy) + TEST_ASSERT_EQUAL(length(holder.spoken_languages), expected_amount, "Book of Babel failed to give all languages out!") + dummy.set_species(/datum/species/lizard) + TEST_ASSERT_EQUAL(length(holder.spoken_languages), expected_amount, "Changing species after using the Book of Bable should not remove languages!") + +/// Helper proc to print a list of languages in a human readable format +/proc/print_language_list(list/languages_to_print) + var/list/printed_languages = list() + + for(var/datum/language/language as anything in languages_to_print) + printed_languages += initial(language.name) + + return english_list(printed_languages) diff --git a/icons/hud/lobby/background.dmi b/icons/hud/lobby/background.dmi index 554543ecf3f728d6af47ef9bd33312457d93c537..5fb9085da09439fc11eb24e69b3fb30d1284e011 100644 GIT binary patch delta 346 zcmZ3-vXy1RlX@FZ7srr{#O^O_ALSQE-W+>1XUR_))QvoZWB!;ZC^7q7Up;1SnO z2eu=FhE2O1ce%XE3_?{5LI*m$5q2u6_5A*MD-s!%1w&`TQyQSr#qXsJo-vKHE;aE_{4B0o3!nDFOB?$wdcTQ}90X}r^HwQv_+ ps+qFpu;(AUBF8<+lXT8l%D;6j-v4*O+Byax@O1TaS?83{1OPHdrSAX$ delta 339 zcmdnWvW{iKlX_E67srr{#Ovkn`GuqEi)9a!v9ah|hhLG?=hgsruAn-$G9_BrWI zI9PFN+Tte+mI0qrl8<+BdFpz!{a07W@t!Z5&iQYu@}(^{Ng=Ne-%3gqckf9*w(r!Z zwJ~yrT2sHUSH$(qoSZQ0X7b9Sf3x223gUbun{c3kk(rI>#$to|Kg(I!cq9y7TenI##N2wvk@jomVS&Rwj$fn_d@uiDnPKv$)PD26 zD1*eGW!X$?a&O-)F){m-z4VO9kxz5w`95d+mB(&h{JQPF=F+9|FWMtE{i&D}U;Ovn zu_T{I^OhZY`~7pK`AWP7QI%pQetX}ShQa! zTk%y*?sJ-IGZp&J-i+2}c5?1C68xOyd{Xt4bj@@5#Q|(jQyixXTRp$!U&bq;IeeiaRLErYS_-s$r#~BW;`2TTDE_JXCe72U=3U5{I{(Bro!6Xa!+&o7!M6DI0z2h{YHD8MRvndFx^B&!$p^Ho3-ju?@2-peym^zu zky@6=Is%z72EDA0Enzhe^i~H{`o53+lN8#f7)KOXaChJRsP|s-pA`R_Ln`WKXD-Uf4jgXmgHuGiUsUN zn~F}nE?(uZ{`|{RjO)*zJf*n){7R`pB-J>^N2-_i(+j{z9n9deaJ@@E`MO#F< z!F-_bQ714TD7-O%!$gEhFFl&WZr=f*5|9vv&bD0FG}g(X%xX-Nr#h=Kz2Ch1>BoYW zGtImXto{Lt-TjQhjR%EGPCQEfxVhl8t8m})&p%6eCg#2Qy^(w3?T!DZcF$MxiPWq5 xXOy_}dTT}W&g<$-_cK;I)yb#0obdX@DwWe$`{VxgYrr(l;OXk;vd$@?2>`Uabq)Xk delta 856 zcmcb{Hl1CyGr-TCmrII^fq{Y7)59eQNKXLb102ji@{X8PEs(OAsH!Jsx;Z7`|D?(o z=S#hQ|KHRdIB+1uLc=o;dPHD9hnrO5UgowudcpvfkkL%x3TKx6%raLCyvexn=)fI zS7Ne8kN-&>Kc7>czKU_~Y!~jyOt`xwLrcR;SMS);gCZKUW=)RZ6uM@3!I(9<-dR?q zI7pjI=rcz&d!XB%`3qioeiRJhuKX7mR`9i$(Ork(DnoC4s6vJ%0|S$%r;B4q#hkZu z-sU|r5ODRiE0~_d_4^?+Q?{`K&NV)K)0 zroAt#weQ)q;at|wy!+o5>zr6K&7OC6;hp-^hm2M~-CcXVw^?V+=BR%mes>kPfg;Y5 zQzC0MnvGWTrv{{bUC484jolQ-nOED5G&cVV_{MxnBdhDylkE{#_E;@A^8{7#?Zsz) z*L|pqoDivc|M&LoKh3?gW~VH>M0lPUH(rvnZK=G?o)OvHM@G{yL#pG_swj}5emgI{@mKd3t&{UEo5`{*xW{q#g zI!Y-SA#1Ws*~ZVrFwDF&+qrgb6@wK``mlp=iKLc?vvu|bVgE4SquOG zN&B;~3w&n&wtd3L1j#1#}~4_xg!A@P3TlPfZ! zMydu{5dRn|BN9jGks3zImfv$N>)`Fbq7fb-*>-Y>!6FXy%g&fECM~ODQBkE8s(X}? zeT!vVez_J#&id!Sr=W;eL5_L*l=E~*hCgLo&C1BQ4z>qhopR}XtX>V4D&_HwDV`cQhl`P~(fkGYtQyF9~ zZ<@D_{?^#J`v+GPx7!8*0A02^-|5lbXbd(xnuDaPb5zLe6||jn?a<3XQnep7@93k9 zS37^MrYp`mnvZdrslyk_v*S6)CCG4ucO()4v^aPOYreG=l9n@)aqra$Yj}is(oqQL@dEl#pvjGpJ9}*(X1u~(OGt>+R*haSy#d@L`Euhk2M2bx zf`QjeJW=G}?&P+w0AR73tdNwxJKxa>0AyCxz_Cpf;wJnDeUrn?Ac_D57QgHU*NNn9 zZQwN?&#@m|H>m40v$C4#z-@ee^Ztx_-5T?Fx%I3gmGf=U7690+QHbD8_%4@}d~laD z-U(`QH=f%u**ygw89;O*Ydny;;PVa2k0@1w0Q=7|eUGXf!iGR4jqo5o9hekra%y{) z@_s?5y#1J=Me-5(^vBodo=g;v-m9U$Le&42qL7+89f@)8q3-Mm2`v;L4#&z(vW3kc z4mOYxSr1#OZ|l&Oev6yIMcxktAEmtc5~%IKGl@cG2uykv{djw_#4yO|dBH%jRpuKn z^|-LCmH0-})C4s_14ke6hp!UlQ&S63OOyro@3^u43?#jc<_WG7GYECfH8k>6sR&Oy z-*)?QjlSFC50O*DgfPkZblcxYWVaUBpPame9T9;woj&LdTEr^~Ckz74!rI0JyI%^` zAUT&F&P<9$-6j*zHH`F9*xTJnb$pt2lW^oUk-}9!BRTA2wYA-+f}ScpD^^o&B`i%8yMnMXhEcYD;U$mbZ@WT2phhis`&#ofDiG@=E zZQDU%pEs|6@$xm|;$n3gjHT8}f-=uNS}`~_?$t@L7|M&XNmkNX6pL5TBV`4lBv=y9 zAUPkqj%)}w)cVoe%a5$O!REW&LU~6UO`Ur&?w2h3WW-5yNi{OZDLNdu{7gx!!1{nV zHem5^=?SNv$A183oUaIw$@^ZF140~(J>=J?xj;y(m^)rN!|LMn=LhZDhH9Skga_+A zn)>(ee~|X`l^&y;^qo=xvEFr!P)VhtVWhilPoL}*IVc?^gB&7~+kOR!7q!;sZ@3=} zEoFqZ(FT{#geSfTh=~eGe8D8!H0pEJ6i|?{n3jsU#7j3VN}*`+DL+gRs+4f6$%9b$ zex&Xc(Ze^qsOeo}LA|Qmwy+~XM>++bj7iX1vYh{7mB^@E3O)!j0)l!pWTB#d`OmE+ zOUn2BMJw)|VuuvPy{qV(|Jm5ztN1%S!nxHsjOLC;+$T0^c^LX&EjLtCpZd^PPPNMY z7=`l#O5cd8vXYbqb=E(>e$rUZ!dz9TI}r6?RkbloyAm$c{aly!Cn-N=#wM=Dsn0-u zZHs#fpW=gr^E040pvc=CzY#W`A3pwZOpNyxY?y`9bL8@0Xmr!x_)v~BLb{=jaULti zO^)%eB!jBb$|@*%9|^9b>hGXOJ3+@~>Fn2)%lRrj7Wxu?GZS|uh6FjsTTB_d%0Ln- zZJ={Y8~FC)21IO#gd-|ox-^8DtQH(Mn>e?Ca9XcOwsXCx$m)L|C?#aT(DfC@Ov|wP znL$!Q4-!OIyUL#A!g$x%C`sAlj1(?r+4Q>q(fPwJ_+pHIC7+P>_7lu#*U%z2W>y7c zrM>@M3cpj(;6?n84qv3va*uknb&8=vSlV7;u*|;jSw6c4!T>~TcRngzi#Bf$0PPr ztm3jTaG4>9*$21YPJ~6Ki$@7ZUw6H|rj-TDUU9Wb3-u?}MTW^O=X=@kezH+>iCRed z25fTjEcwDM0iSO<<#<|GC1iyO+ON~t>rjmQ%DsP9>sYfg+-(pF+baqCFLYmGcAb54 z|EYrA(B+Z#`l&c&ivQp3C$dCTVQ0FqE>mB|4Yi&x5Cr@)f<9Zcc6(9F;YuY=D~dfS zaub3p7+asf3s>36>C?5Qg@~s$Kl5>JhkP(g_0aoz=v&qC&__SA=WL<_>30;b)OlXZ zTlOD6RM$Jw?lf#eO(C`n&o=K}omEqb1drchY8g}GhL+pps5H3+FCI9ss9_dvG?kRW zd-sw;&!7HXgQBPLu|X~E$F8amrbSv!;^hOIiTqN8R@=-oY2s%w|6jYh(3%4_H7nNp zaQlEOWCUtEZ~6GpUJbb~nc}NaVAA1i-;P`v;aJ~s52G?%MPeW8DL-O) zb+2b9Zpm|TrXHilS1#H*Z?=R`2f1&2zBn_g8sh!Ra>$CVUaFi}-RxerN6fmxjy_*$ zh~;Grd|_tn? zV>zcQFiVToj??=zFUO1h`36#VOUqfhEyde#=S5|g(m6x7RsRh;{Ewsff;(!q}3 z8@Ha8`Aq8{ls~(Wr}C*P+l>{3bm}-&@Ge9qvf@GmvzH9r*Qudj9?AlmI{ zjKo@*-z#IQ&nFFZSPk#}w+@xtoY|OI5upXD*?2J+NzmGVotclUAq8MDP({s%7O^XQ?IClYEW(d$96pM%C0%rr?)-gTNH& zR2;n?t&D(M{(3^i!DQ(Y6_^6MePv0fyZncQ8BS7{YWw3|EeCV>6AG)myDEgO4@(wK6?k|1$+!hz<+F8X`W6h&s4n_@k%x4 zbD_b-1%34elKnM`<=5|?RLp!|oh;GOwu^mpTc|5+UtzzZxaQ!Nvec2jGG8g$=&Y&hhYd0C3W96Q(*%sqT!Or#cbT;LhbGmKy+p422dkXv| z%O|ZckQd61o>K-G9B-(%?E>pmr}V`A^ZMGd4LdOxZ0KvP6}j`l zZ|x{gE5*!+wYq4#SUPdGJIzi*r!Ma#tn#Czll7rc()kJ3UQgcYa9%Q&gzV-5d*ls~ z%IO^MurHLWq`EVq zp|vDlXL4s{o9_G`cKb$cr#Ts8W5k5KU+qD&Ux<*G?nLr`hxE$nU6z8?j&YyV5Y-<{ zB9NG60uVcP2S@XGcVlA7l1sg1sOEG})N{i%e|qZq2wf5-5{_ENUs%okV>; zvN?af@<+2md$#Q5`Mh*))BE&k0Nk8Cosw~IEA5a=bFn9?+2FT7J^iFy3n^}`?wQW& z1d(_O9+o}Rg8R-nmLhp#XB@5g*!=?&5c+U8bi)*^e68yjSkLt_EpC{GyoGf3&4I!P zvC3*iS4m@I(-rQgr@LSM0tId--kuL-CdO>|<(a}|TntpWGe$JV`422FR^Pl!iF0eezxJl4Ge#{AMV8NieoPVWaA6 zFQHGNMNv{rD$2Qk9}soYtxe93mKhwcUHaR+Pv0pvH;|a;+AIJWFfhzU+GhdeQi3a9 z2mYXXBAbQ+a59=gu_1g(U*s+_j6wFcu)bKIt40NbK-NhH;DMw|!uanbU=elB1$Lre zT)ahBn}fJd1`XMmf|)k>b0yDbvTT+p1S%lj*Rj5oQM1CRP_-rGO2Xp7A+qj}-v5Qz zf`9X*zRoF;54)ut(DZ9+ppq;k3TC9Z}*Ka@Fj3e>ywRwmL>fIxD$L9_>y!X4fLQecEOLbzMZF zVdN)HC9l>UpoLSxiA_Mm9V^D%??9J?bnt2`2%IhRuD++b(El)r4HPa^~LUqAk-6={I@0Yi=y3yaZ&>#Ep_otm<(XufC z46d`SHz1&-tX;A5pS*0;##zTdIW-#M{HjX^H6)h5+PvG}6R61b{z^)dMdx$NDK710 zIb$M*;`Lx&le8hlai5AD10piplu88L#$jamUwk~8eo$W10q3S8ni== zb4ufEFq^=g5Go%8-u73crwPmm)2a%T$JOM~4-r1vs0*7`y|K#Pyfjmhw_ycHmv*H4 zo=+d&`ci$!vi6NEL-)A15}Q=qKi0GVOmlFfey}m3!(Kn|&7FHn`(c~3V`ZqmI#C}z zuv?+ivuEB}K?g_ypPzAKvno_zPNJl*5>7eVkxZjaLr~baa6E~8afTWi%Jui)vHhmF z;p=zOKv8LQKMlTr>rNxU2PIr)V}fb=g?-^d155W4Kn3+tK?uLGN`YSMZoMTD4m-lI zlgV-Vtt00Mt@e|GQw_MW52XqM@B%iD$OS)rfRrv4GMjx z@hcW4sOFaW~0zM);m5*0+ueZY0JG ztU|CgKi|kiO}*Nw1z^@43}#H1*b*zP9;E8NGYJttIRGxdEpYPOY?$-oC38i-86*%; z9q1C;n)5A*tv??fy}c`OR9nCC-dQ!9TqtprJft9SLFsnM-}txQa^H;D#KH6U%1H4x zPFn^BMJdEORn{i*#dNeA)K+r7;$xTu5h!H)AOC&*%P}MhJHn7zS@!|WQtxm>tQR41 zoB2|SA_9)eCqe+_?4sd;>$dMMu+`k0KDDmmE}zVW4IVvTA=GnE!RL9%DU!#>Se!V` zwJX&HZp><6z2oBAXOv_|cm!Y*W!=6n4d8|G)xkbHnq&COiF3)4QHUC6s4Mi`W^tX} zx*Zkt?`t~i@H9E}Vpdfn4XMYuXw9eR=0yAdMg^Hz?f~w+t1a1u&w}UbzWEDDXnAj} zrZm`_9hvnO5U62{0MVT&PTx|FQ-x~A%HtmswZ&!A{78RwgT!ByuppxDI7HzPsQGui zlq8>LY(5{t`qlMkDz}rr#b?j?d_C6;ezjjU_-l>NeV*?A`hb+MkG9~=9E~UtE}D-C zZZAg#m4QUO%oPa-yC%DUeN4<`V${Wyg5R*hw*XKc6Lux=r#!s3>fPYpr)@S2byaZ619lMkPx#QXDfel?qAG_Lq6*a`(Bn5$)XB z%1O<=n!F2%W^0|=(?LBMhri$##p7?1wvz_McC|{X+o7+S?6e&H5$5j`-&w5LY!W{F zofsTLgE)QrgSVA3#zfd_MH>xVTGBDsXOf^rZ4qr5D=7L*_So0mz?6roA-pOMv{6Dj zAN^1#fSHu5DtJI>obXO7{N1Q{I;N%-OV9>p#CBC+z9Amhc%8qVw;}-~Bnk{IpTs7H z3b4x%&De%bZEa)pB8b?Sf6)EjAt)9T3<|tk^8rlclPgfWJt2nH#sw4pW%)8Mh$AhLD%I|5+U~*23wcbki`Q@G2mG6+FMXQ$+Br7&1#JLCLdfDe)vdp# zH{~3?bEKy&wam-Wt^BWf5yj zw)!5xHzetk-Dz~bge|<$aJGMwb9dz<7ObffE{l3kJnCGQhiU+}GAs{qb`E(Py`X-U zM9t$&40c1H187LGQ5${7R`i1TC}J=jIYzjlK6bo28YEyVb`njfSFDga;g4RPqzFA% z3I4OO1|!tcVohp23hN_Ul_j@#SrVYXN507)5Q=akeIwpa!x0k7Wig+yEbnidzXRYN zDYrJ>!RJ}qrC8M0iT=--U!uPwBx%iU+K3d^N@6zX*qf_QVH!-_}2Wqr2#xr&EB8Z6xnWmjW=%>8K>vmhfbN-uk9CI zqR%)wyXaO>7gtxAq;uaqOyO7SqZ9~l8{*aYgTa^!A+L11<==UjG?y2`YLX>+oAS+< z{eyN20Z+3e2mOx7p^e%Pe1`LL7DbbiGWcRvf+0q#8737+(;r=`f+!L z?#=T7TV_e`3_|R~F}hPvB}TnRF8r;7%`+P`_3_v@omG-5=;feOLuY$^prY|jN{ z%DBhOU=RCnCBK_+`Jmj}7L4avuPXb|~LVPqN1 zU7>+6$3_%b9j%HZfPipkbdR{UWRx__%Aa2N2TuGBu_4oF)@#M$-xi&TfaK7m9C`vHArr%^t>k*gb2c0Nyh!n8o3x)NTDKq zvG7DWs(c38&-2YZyxP6*A#<_vUinYSHg^fQAYRT!PIv%1SegiMIFl4p)2Y5Ny(uj!K%NhuqRHxgUE@cO4prB$Gu3*-KP+mAR!RU*A;yCK|t(dHaG;UI`j0}^L)ujJF|IS)P=#vYMSxz zoATR;BH?HE^#hH|S+gT5usxr~1pF0eCU-mDJ>vdngMZugP=^Wl-(Hi zC5+}c#+?2CZakU3DJoRN37@=~^TKDVyK()NE2N*BLjQ_(x8V$z0K&xX|0$c^r&T6H zTe;Q9Yaaq;h~QiLCgS@P92x-#*}~>FUS66Vo{Q_4>q!}-G1+wtLz8gj5 zgqystwo2248D)4U8-i1kiH~r4vY+A{tScAy)H&8RRYE-tfmLv73McA$<)cGiWWAkc z0RwMX=BH`-%7%m*wiS_JU=mzOXSCYv_P&Q^sJ5b^y87T*cw1y_ssSh0m%xuex%18> z%y3@;aNu3<^+`pUT_H&5Aowh-fIC!_MOy#3FN*@v$Hc08r&)!HYLNf*OM#X!0AMX+ z=-#H?YL8?;Im5M3-*}lqe0Rn#OTZ}-a5`(kBcsfbwKC;A;KL+1AZo+@H0S@1?Ccce;l%fdp(7l_&)0im*jy>=w}W|PE@%<;rR z>-5&OinA{F%W+Q{c75t~-Eyv4v=LT?jAEc*Z;E1)iX7Up@~@+bPCXQ06r%nfME(BO zXWE6oh;KomU@e&N+{DtyL;K-euAah#&!c&vgNXq9aUdOwY*XYdV|vjg5Z-tAD@LS| zhf}+zEd)Dt7vRrFvXx_vt_zAk3Y+@x*~XWvf&CrTeSt2!G&gp^Sg45JTGtjk3um{iS?>hv8mS|sn8&ZKxaSY59KI-=dcJ? z>HfX78f6TLj>U|Q_;wr_jIZmFga1^rufxx;k;5=UiV2UZX*0{wm^5|J*er@6B2i7h zHkiNUxAhdoSiVy9bLXEHG7(wH~RZ+35qfp`E)XQNlrVmmBuWNx>b ztT*oqlu;2f1@UOnaP@9kJKhQnk(V$c5>p?okdGeCIj=Gs28a;=Hij1X%fhwOKqr^n znF%2bGz>5&@kM15+Awb}1<{WF9M9Ms6w(#woGl`q*YYfrLl#e_F#>2zlmZcFJcyu( zH7edGv{1`5&i5U3RXbHI1dQA`wsz^a$$CnWG^4a2E5#2-r~0i; z5D_$dKq&5f!;h&Oj7D1ZE}D8^V_6BfUpX{OV?u_cy2c5uSeQfupTIxXa7*IDIdstE zgnDGMR~)2MG$>kuV6ixCQqH<6k!j6l|Ezn0XPyV(R`>eP1)0k{lpHim-$IGUm6?zj zNjigPajuGvBW+Jy8-zrht27SB+tP{2SDEdo@rwE`wLuu~k`{2X+uEuv zn5}#Iw|AgcpqSWj+|Vr4@~LfaecApRVlM&Sw@z32v-bW)$?56j0bBm76 zVezHowy#uN%8K4Q6#@t^^9$9iP_d|)xV>A5+!a=XVluq`=Pn&P@A1b#Ckv|F+f6M8 z2b%0}uswEZ?ZgF(m>H8PM&8__k`@o+h)pu=B)rztszUtV*Du5n^Pd%XGpH~IZuQKH z_Snal2MAVI6Um{es$4>`U$#~%^uL#`a#MxnoBSQ}R&xQ;5aCghq^yM80^ zo-1kdT(i}iBCT9Y>y@}I&TPHMEKRDUJeo;Dsu9X}O>VKnMPY4B$FbaY8;u4QgMB^ zRuad{Yu=`S%zM^u6``NhXIMq&T*YEl>JR*iC60nAIx2iXxSZZk{-j;#VQ#D3UxZ_i1Hy5*_e>>FsEA;jhU^cHcG+d zH?_J_I8sta`*CFv*pQ_CNc45Fg>bu1tcb&rxWDZ1p|Jz2TSE=s(PYvYLAm$K6ndJ@ zM-Dmi9F^K(nWpfvvNluw)I=Xb|70mvVvf*7Gx9)}SHZGvn|}dV0Fb2ifw=#x=Or%z z5lc`c-)KHxPv`Ni_UvwesPj1}v!x%1DDSzie&N72!1_i2_0?EGFFg;?# zN{~fDPOaTb%V%>HERQD zS_Z=v5@xz@=ZzoAErenso8B#{t_Uud)& z!wyjw4n*md`Oi%Y{HGSVrBxln5(fS~qKJLtb;t`>82ep52|jx|is+Ra3@GR7M=8>W zRTS8_Esw$YUWpFWtcvT=&{#nQ*G@S}!XIvF?Hbl0Lknns(I&-&rZO4Uq_2+ngdYf6 z)^R6@OtC3fx$AGKiWPqtK<~G)*!mqSp+>ONP@GW`=rEqt$^|aO2Fg^IIgq?ELx=ugCcSWj7*+%HWv=CE*C;Ux`P5r(g2y)O8 zgk{ZjzH`PlDNjF2Y?9p|as79j^B}IgOfPrL5u|j=)9kd!A&OY?BjN>^O3=t$kYD|2%EA=M9Fyhp zH#hqGj6utsP9Hk^B{id5vUQM!>~cx)*V^isf}ZfvJk*Vc-i3fR{wlm>Zj*lV1utsKUly4^xzteRNJ{90BBW- zY!J8`nX2^Z<)r2vI{cH*nU!-6S0;YI37Tep*KgMxbwCo_4?;0!$k2iS2atTNctNdd zZz0d}xg)S8*QwGBspYIS6%&7Ws+yF0I=7ShnOVp0!kD^dYpmKA1y}t|4ZXN6gPwGS z*m47+B!MdDmBVH_{@Qc^)(JxGj==R<;-!7Uw?|0SWuVKTvyt2a{>~T@;mKQNhLl%I z-1yXBLl2GD@DipIociY#^N6MUFvooPq3NbT)xN4Y4#rkBrU9@bm>vWDmrp!g0G|Iz z*IF*@IZjv-1WO)Didb!$;~*|8;IwxJn}vX(0A&W=6LUf1QYJ(t4b8@nNp;R}dOj43 zHT(9TpUhJm?$6Zwjrd`KuLY*)KB#8NdrV-pV@@hD@J2mLTm42yiiMucT#=-L^}wiv z!J4eub$52NXGd%B;dOg)l+;Jzc=DHlQ!PGQ+OPnz6I~3Lxp^UbA-!b1SQv6wwx3mJ zk@@`+2m=nPd48c)Ti!H|4#)Ye^b)AVl(jfAnz|Dc(tiF^&Y$ONDH4PJGZZTT#0SK9 zd_?=v=k3MO@^I1-M^kh&(wcddZtn4M(B7OQGu4vtPAD1MiqWd?6nK`+Ab^vEtp{TL zsN=~V7edsM3JhJD&~qQxthj?+ao59^R-Y2CxiGb?sn2-mn<2R-ve`!zJ`QIQ(NyPg zoUfTXi?6sNJ^-v>^D!UG`o7CyK=gj+2Zhn20!V<#!Yxd+c&Wa9}5Tx56=Y-b82{#45dTi+MIQjLkh7lB6f*eix=T9TMBC7e+>C-pBz(v0t zA4eYl?9&AiGfD~2*@j2T>1+(?k!6VwSz1ob{<#Q(;;iiV#k*cnf=6_ht-q$L$Ox&7 z*o8pLq4GZla1h8QDlN_l{oX-rQV2X$LX9$T>YoSsWZ5unK?%W+~x7lD7YR|5#QK^h?m9sCH!5X1;2>^4(|l?|L}2$A4q^R?kQM?-z70 z7U#{@uNCf0C!gLcF{97iqsI4W8&nprKa!&0uCLopV9ma32s9{@3VeQ+`h&UZS^{2K z4g&==UMWRRFS$#~|Lnf4btAGAKY&P;j|tSn1yjNRx^5F_xjFCsFL#Wy(>MS=_vBOkpnqT%s$EejDIk!Wi6&;yyX(fxv4$+6X6L=~PJ zSU+cSgK(P@yU{Va&=7J9yYxOMxArech(h_Cm?^($!qw&2nFKBFoH1}Miw9^4v;12I zx8#5b(5GZu6e8_Aj@R{;V~k~faG)jv82)7DQ+LGg41*Wju?&GegCv_OeZlX z6N7sUx5*u0miedDJzbkV%d<0x793@ROV_DQ7q0m&}egiS1 z?Lzh~1ix7B)(n^DtEGQW2+;q#ZdEYG1j0CX{u3yHsgj|w&|p}gG-|#{{ z0F!nF!!m64dz5eraTFd@S7X@D&UoCfJ?G&SW55)X1?7>wAxeS{l#NcEjZR!342^R4(H319{fJ(qnl=BP-!;je`-xIkBL1BJ zK+;qI;8AK;WOa4nx6cQ3{pxwg8Y?g~X7V}ZP35IiC^HH|TP_F(CCEX?+dI=cEd)bp zeLEf(;L+;fy|= z8~ccMNw#Di@+d`?Z=)kI0AR?>Cp1+1c{uCTy;Wnd5EJx8@0Lyx3;+>fuUC8p8GHVZ z3}Xyt5v54dPy1PfG(Z%fcZ6ZmOD+wd$l%NIrhTN*fIGg2h^zD|WSvM#i_C(mfL%3k z-GU$n8*e6FteSj0bjB-D4r-dg5{#oLjQ+*?*7)rox+a%g*T!hh2vv~RM_yC_GV$^4 zjz75y^nBai&XH|>MEplLEEZA|?^EiWr+>$0(t%qj!VsYXcVf+X7_eIW<;a6tBZ7fm zJ+Y1ma^1IBY;M=ZKUFt|QEf!FX{L=B^)vAv;>H5I%&7u_{jwW|C-%)x2H`leT!Dqp5uT0XL3r@srXK*yP9Sh+Ah*)9F zJMHan`gL&bVgq+DTNB0!(;%EUTvC1AQK$77+(L|+9BLX9-M8tuO6^>4bW49Xbv=?i zMyvAp&0xM&kONY-$i)-fPkM)InEm1fTc^gF7J}GTtp26--`Q`TXzU9)4qVX*n*SgZ zO#_spp`vYXSn`ZxK>Rn7N3&7oL%`A_g9nXc^$huH%gjRXAkb3Tr3T^0oXzWU`wPDN z*PXN;ImQ$mSm{_%@#S*Q^mC(3mNn<1q^f^7WxG3u0c?JGa`Z6e1BAd~vnOJUmH0p5 z*ByX6?jeJb4G4w0Yv=6TeCStBEznR{g-=#{pEo_M27jdZc*ybX#^%7}Pttz$*YODz$t*t@M8>n*VWdV(X*|tu_(m6xXUQ zwmNuQ6%DKUidlWrxZ1{hf%*+Gii& zYvNybj~VN+s>*WYi9Y;6KjBnH&2{&2cy7C^UdypksR~FjX6(9yqPA}ZoFWL7&>|;e zz|xn3a_Dx3tsl)pr$mv#N$mgdzpm*J2wF6bJ+$~@^a-e6&#=ill^{-p&+4OD0o5A~ zJ;(S1k3js(m|B>KCE>pyhU6@f_GMvhrv{rn_Al>Fyint^a3xHZ8SJ>}jq>k=vCkE~ z9`giy!7+$|_w|e$Tw6VsS`_%PTup0HR%VzhK1)^(JNYpolH@J^u+qoXXV7ZgU~_TN zcdS?1YyXjfbirk;WIcfSrt{1>OFT}LTHD@Zb-Ct3YBJP(n(*T)CIW;)KPl*PN+|r_ zD+Qe23V}bDHkBZ0S!2)sAuA5l`w92=6QxJm_nPqsGHazmwyJ52AOF7vyp&Uwt(G

_G<#P6WYww%+z$VsX5xfGbk`7Ab8(iG;v>S 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

FknX5`@Wyu9v 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 literal 0 HcmV?d00001 diff --git a/sound/misc/menu/ui_select1.ogg b/sound/misc/menu/ui_select1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d9b3ac8f61af3594adef3779ef7c51dc9c99c34e GIT binary patch literal 8355 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 Aga7~l literal 0 HcmV?d00001