Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2

This commit is contained in:
izac112
2024-12-04 15:21:21 +01:00
51 changed files with 1908 additions and 258 deletions
+10
View File
@@ -298,6 +298,16 @@
active1 = general_record
active2 = medical_record
screen = MED_DATA_RECORD
if("sync_r")
if(active2)
set_temp(client_update_record(src,usr))
if("edit_notes")
// The modal input in tgui is busted for this sadly...
var/new_notes = strip_html_simple(tgui_input_text(usr,"Enter new information here.","Character Preference", html_decode(active2.fields["notes"]), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(usr.Adjacent(src))
if(new_notes != "" || tgui_alert(usr, "Are you sure you want to delete the current record's notes?", "Confirm Delete", list("Delete", "No")) == "Delete")
if(usr.Adjacent(src))
active2.fields["notes"] = new_notes
if("new")
if(istype(active1, /datum/data/record) && !istype(active2, /datum/data/record))
var/datum/data/record/R = new /datum/data/record()
+10
View File
@@ -270,6 +270,16 @@
qdel(active1)
if(active2)
qdel(active2)
if("sync_r")
if(active2)
set_temp(client_update_record(src,usr))
if("edit_notes")
// The modal input in tgui is busted for this sadly...
var/new_notes = strip_html_simple(tgui_input_text(usr,"Enter new information here.","Character Preference", html_decode(active2.fields["notes"]), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(usr.Adjacent(src))
if(new_notes != "" || tgui_alert(usr, "Are you sure you want to delete the current record's notes?", "Confirm Delete", list("Delete", "No")) == "Delete")
if(usr.Adjacent(src))
active2.fields["notes"] = new_notes
if("d_rec")
var/datum/data/record/general_record = locate(params["d_rec"] || "")
if(!data_core.general.Find(general_record))
+10
View File
@@ -214,6 +214,16 @@
for(var/datum/data/record/R in data_core.general)
qdel(R)
set_temp("All employment records deleted.")
if("sync_r")
if(active1)
set_temp(client_update_record(src,active1,usr))
if("edit_notes")
// The modal input in tgui is busted for this sadly...
var/new_notes = strip_html_simple(tgui_input_text(usr,"Enter new information here.","Character Preference", html_decode(active1.fields["notes"]), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(usr.Adjacent(src))
if(new_notes != "" || tgui_alert(usr, "Are you sure you want to delete the current record's notes?", "Confirm Delete", list("Delete", "No")) == "Delete")
if(usr.Adjacent(src))
active1.fields["notes"] = new_notes
if("del_r")
if(PDA_Manifest)
PDA_Manifest.Cut()