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] forward refs in usr dialog (#10115)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-08 16:06:42 -07:00
committed by GitHub
parent dd1e35202f
commit 90329c46d2
50 changed files with 229 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@
disk = null
. = ..()
/obj/machinery/computer/transhuman/designer/attackby(obj/item/W as obj, mob/user as mob)
/obj/machinery/computer/transhuman/designer/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/disk/body_record))
user.unEquip(W)
disk = W
@@ -49,10 +49,10 @@
else
. = ..()
/obj/machinery/computer/transhuman/designer/attack_ai(mob/user as mob)
/obj/machinery/computer/transhuman/designer/attack_ai(mob/user)
attack_hand(user)
/obj/machinery/computer/transhuman/designer/attack_hand(mob/user as mob)
/obj/machinery/computer/transhuman/designer/attack_hand(mob/user)
add_fingerprint(user)
if(inoperable())
return

39
code/modules/resleeving/machines.dm
View File

@@ -401,13 +401,13 @@
return 1
/obj/machinery/transhuman/synthprinter/attack_hand(mob/user as mob)
/obj/machinery/transhuman/synthprinter/attack_hand(mob/user)
if((busy == 0) || (stat & NOPOWER))
return
to_chat(user, "Current print cycle is [busy]% complete.")
return
/obj/machinery/transhuman/synthprinter/attackby(obj/item/W as obj, mob/user as mob)
/obj/machinery/transhuman/synthprinter/attackby(obj/item/W, mob/user)
src.add_fingerprint(user)
if(busy)
to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation."))
@@ -442,7 +442,7 @@
else
to_chat(user, "\the [src] cannot hold more [S.name].")
updateUsrDialog()
updateUsrDialog(user)
return
/obj/machinery/transhuman/synthprinter/update_icon()
@@ -466,6 +466,7 @@
anchored = TRUE
var/blur_amount
var/confuse_amount
// var/sickness_duration // CHOMPRemove
var/mob/living/carbon/human/occupant = null
var/connected = null
@@ -495,7 +496,12 @@
manip_rating += M.rating
blur_amount = (48 - manip_rating * 8)
/obj/machinery/transhuman/resleever/attack_hand(mob/user as mob)
/* CHOMPRemove Start
var/total_rating = manip_rating + scan_rating
sickness_duration = (45 - (total_rating-4)*1.875) MINUTES // 45 minutes default, 30 minutes with max non-anomaly upgrades, 15 minutes with max anomaly ones
*/// CHOMPRemove End
/obj/machinery/transhuman/resleever/attack_hand(mob/user)
tgui_interact(user)
/obj/machinery/transhuman/resleever/tgui_interact(mob/user, datum/tgui/ui = null)
@@ -532,7 +538,7 @@
//End chomp edit
return data
/obj/machinery/transhuman/resleever/attackby(obj/item/W as obj, mob/user as mob)
/obj/machinery/transhuman/resleever/attackby(obj/item/W, mob/user)
src.add_fingerprint(user)
if(default_deconstruction_screwdriver(user, W))
return
@@ -547,7 +553,7 @@
var/mob/M = G.affecting
if(put_mob(M))
qdel(G)
src.updateUsrDialog()
src.updateUsrDialog(user)
return //Don't call up else we'll get attack messsages
if(istype(W, /obj/item/paicard/sleevecard))
var/obj/item/paicard/sleevecard/C = W
@@ -560,7 +566,7 @@
return ..()
/obj/machinery/transhuman/resleever/MouseDrop_T(mob/living/carbon/O, mob/user as mob)
/obj/machinery/transhuman/resleever/MouseDrop_T(mob/living/carbon/O, mob/user)
if(!istype(O))
return 0 //not a mob
if(user.incapacitated())
@@ -583,10 +589,10 @@
if(put_mob(O))
if(O == user)
src.updateUsrDialog()
updateUsrDialog(user)
visible_message("[user] climbs into \the [src].")
else
src.updateUsrDialog()
updateUsrDialog(user)
visible_message("[user] puts [O] into \the [src].")
add_fingerprint(user)
@@ -662,6 +668,19 @@
occupant.confused = max(occupant.confused, confuse_amount)
occupant.eye_blurry = max(occupant.eye_blurry, blur_amount)
/* CHOMPRemove Start
// Vore deaths get a fake modifier labeled as such
if(!occupant.mind)
log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.")
if(occupant.mind?.vore_death)
occupant.add_modifier(/datum/modifier/faux_resleeving_sickness, sickness_duration)
occupant.mind.vore_death = FALSE
// Normal ones get a normal modifier to nerf charging into combat
else
occupant.add_modifier(/datum/modifier/resleeving_sickness, sickness_duration)
*/// CHOMPRemove End
if(occupant.mind && occupant.original_player && ckey(occupant.mind.key) != occupant.original_player)
log_and_message_admins("is now a cross-sleeved character. Body originally belonged to [occupant.real_name]. Mind is now [occupant.mind.name].",occupant)
@@ -682,7 +701,7 @@
icon_state = "implantchair"
return
/obj/machinery/transhuman/resleever/proc/put_mob(mob/living/carbon/human/M as mob)
/obj/machinery/transhuman/resleever/proc/put_mob(mob/living/carbon/human/M)
if(!ishuman(M))
to_chat(usr, span_warning("\The [src] cannot hold this!"))
return