cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Painting don't get finalized when naming is cancelled. [MDB IGNORE] (#20039)

Browse Source 
* Painting don't get finalized when naming is cancelled. (#74178)

* Painting don't get finalized when naming is cancelled.

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-24 08:47:53 -07:00
committed by GitHub
co-authored by SyncIt21
parent 2e1086d89d
commit 8311d59beb
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/art/paintings.dm
+24 -11
View File
@@ -179,13 +179,17 @@
/obj/item/canvas/proc/finalize(mob/user)
if(painting_metadata.loaded_from_json || finalized)
return
finalized = TRUE
if(!try_rename(user))
return
painting_metadata.creator_ckey = user.ckey
painting_metadata.creator_name = user.real_name
painting_metadata.creation_date = time2text(world.realtime)
painting_metadata.creation_round_id = GLOB.round_id
generate_proper_overlay()
try_rename(user)
finalized = TRUE
SStgui.update_uis(src)
/obj/item/canvas/proc/patron(mob/user)
if(!finalized || !isliving(user))
@@ -322,15 +326,20 @@
/obj/item/canvas/proc/try_rename(mob/user)
if(painting_metadata.loaded_from_json) // No renaming old paintings
return
return TRUE
var/new_name = tgui_input_text(user, "What do you want to name the painting?", "Title Your Masterpiece")
if(new_name != painting_metadata.title && new_name && user.can_perform_action(src))
if(isnull(new_name))
return FALSE
if(new_name != painting_metadata.title && user.can_perform_action(src))
painting_metadata.title = new_name
var/sign_choice = tgui_alert(user, "Do you want to sign it or remain anonymous?", "Sign painting?", list("Yes", "No"))
if(sign_choice != "Yes")
painting_metadata.creator_name = "Anonymous"
SStgui.update_uis(src)
switch(tgui_alert(user, "Do you want to sign it or remain anonymous?", "Sign painting?", list("Yes", "No", "Cancel")))
if("Yes")
return TRUE
if("No")
painting_metadata.creator_name = "Anonymous"
return TRUE
return FALSE
/obj/item/canvas/nineteen_nineteen
name = "canvas (19x19)"
@@ -455,7 +464,8 @@
if(!current_canvas && istype(I, /obj/item/canvas))
frame_canvas(user,I)
else if(current_canvas && current_canvas.painting_metadata.title == initial(current_canvas.painting_metadata.title) && istype(I,/obj/item/pen))
try_rename(user)
if(try_rename(user))
SStgui.update_uis(src)
else
return ..()
@@ -501,8 +511,11 @@
return FALSE
/obj/structure/sign/painting/proc/try_rename(mob/user)
if(current_canvas.painting_metadata.title == initial(current_canvas.painting_metadata.title))
current_canvas.try_rename(user)
if(current_canvas.painting_metadata.title != initial(current_canvas.painting_metadata.title))
return
if(!current_canvas.try_rename(user))
return
SStgui.update_uis(current_canvas)
/obj/structure/sign/painting/update_icon_state(updates=ALL)
. = ..()