cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] usr to user up to player effects (#9552)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-01 10:31:19 -07:00
committed by GitHub
parent a7e4ef7dad
commit 0180cc74c5
297 changed files with 1866 additions and 1893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/resleeving/computers.dm
View File

@@ -230,7 +230,7 @@
return data
/obj/machinery/computer/transhuman/resleeving/tgui_act(action, params)
/obj/machinery/computer/transhuman/resleeving/tgui_act(action, params, datum/tgui/ui)
. = ..()
if(.)
return
@@ -391,7 +391,7 @@
subtargets += H
if(subtargets.len)
var/oc_sanity = sleever.occupant
override = tgui_input_list(usr,"Multiple bodies detected. Select target for resleeving of [active_mr.mindname] manually. Sleeving of primary body is unsafe with sub-contents, and is not listed.", "Resleeving Target", subtargets)
override = tgui_input_list(ui.user,"Multiple bodies detected. Select target for resleeving of [active_mr.mindname] manually. Sleeving of primary body is unsafe with sub-contents, and is not listed.", "Resleeving Target", subtargets)
if(!override || oc_sanity != sleever.occupant || !(override in sleever.occupant))
set_temp("Error: Target selection aborted.", "danger")
active_mr = null

10
code/modules/resleeving/designer.dm
View File

@@ -216,20 +216,20 @@
return data
/obj/machinery/computer/transhuman/designer/tgui_act(action, params)
/obj/machinery/computer/transhuman/designer/tgui_act(action, params, datum/tgui/ui)
if(..())
return TRUE
switch(action)
if("debug_load_my_body")
active_br = new /datum/transhuman/body_record(usr, FALSE, FALSE)
active_br = new /datum/transhuman/body_record(ui.user, FALSE, FALSE)
update_preview_icon()
menu = MENU_SPECIFICRECORD
if("view_brec")
var/datum/transhuman/body_record/BR = locate(params["view_brec"])
if(BR && istype(BR.mydna))
if(allowed(usr) || BR.ckey == usr.ckey)
if(allowed(ui.user) || BR.ckey == ui.user.ckey)
active_br = new /datum/transhuman/body_record(BR) // Load a COPY!
update_preview_icon()
menu = MENU_SPECIFICRECORD
@@ -282,9 +282,9 @@
temp = ""
if("href_conversion")
PrefHrefMiddleware(params, usr)
PrefHrefMiddleware(params, ui.user)
add_fingerprint(usr)
add_fingerprint(ui.user)
return 1 // Return 1 to refresh UI
//