Skip to content

Commit

Permalink
Upstream conflict fix: ai_pic
Browse files Browse the repository at this point in the history
  • Loading branch information
Furrior committed Sep 20, 2023
1 parent ad4d8a2 commit f16165a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions modular_ss220/bureaucracy/code/photocopier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
if("choose_category")
category = params["category"]
. = TRUE
if("aipic")
aipic()
. = TRUE

/obj/machinery/photocopier/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
Expand Down

0 comments on commit f16165a

Please sign in to comment.