mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-31 03:52:31 +00:00
9c6fdb567d
About The Pull Request
Converts more inputs to TGUI. Possibly all user-facing input lists in the game.
Did any surrounding text/number inputs as well
Added null choice support so users can press cancel.
Added some misc TGUI input fixes
Fixed custom vendors while I was there
I refactored a lot of code while just poking around.
Primarily, usage of .len in files where I was already working on lists.
Some code was just awful - look at guardian.dm and its non use of early returns
If there are any disputes, I can revert it just fine, those changes are not integral to the PR.
Why It's Good For The Game
Fixes #63629
Fixes #63307
Fixes custom vendors /again/
Text input is more performant.
Part of a long series of TGUI conversion to make the game more visually appealing
Changelog
cl
refactor: The majority of user facing input lists have been converted to TGUI.
refactor: Tgui text inputs now scale with entered input.
fix: Many inputs now properly accept cancelling out of the menu.
fix: Fixes an edge case where users could not press enter on number inputs.
fix: Custom vendor bluescreen.
fix: You can now press ENTER on text inputs without an entry to cancel.
/cl
76 lines
2.3 KiB
Plaintext
76 lines
2.3 KiB
Plaintext
/obj/item/teleportation_scroll
|
|
name = "scroll of teleportation"
|
|
desc = "A scroll for moving around."
|
|
icon = 'icons/obj/wizard.dmi'
|
|
icon_state = "scroll"
|
|
worn_icon_state = "scroll"
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
inhand_icon_state = "paper"
|
|
throw_speed = 3
|
|
throw_range = 7
|
|
resistance_flags = FLAMMABLE
|
|
/// Number of uses remaining
|
|
var/uses = 4
|
|
|
|
/obj/item/teleportation_scroll/apprentice
|
|
name = "lesser scroll of teleportation"
|
|
uses = 1
|
|
|
|
/obj/item/teleportation_scroll/examine(mob/user)
|
|
. = ..()
|
|
if(uses > 0)
|
|
. += "It has [uses] use\s remaining."
|
|
|
|
/obj/item/teleportation_scroll/attack_self(mob/user)
|
|
if(!uses)
|
|
return
|
|
if(!ishuman(user))
|
|
return
|
|
var/mob/living/carbon/human/human_user = user
|
|
if(human_user.incapacitated())
|
|
return
|
|
if(!human_user.is_holding(src))
|
|
return
|
|
teleportscroll(human_user)
|
|
|
|
/**
|
|
* Shows a list of a possible teleport destinations to a user and then teleports him to to his chosen destination
|
|
*
|
|
* Arguments:
|
|
* * user The mob that is being teleported
|
|
*/
|
|
/obj/item/teleportation_scroll/proc/teleportscroll(mob/user)
|
|
if(!length(GLOB.teleportlocs))
|
|
to_chat(user, span_warning("There are no locations available"))
|
|
return
|
|
var/jump_target = tgui_input_list(user, "Area to jump to", "BOOYEA", GLOB.teleportlocs)
|
|
if(isnull(jump_target))
|
|
return
|
|
if(!src || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !uses)
|
|
return
|
|
var/area/thearea = GLOB.teleportlocs[jump_target]
|
|
|
|
var/datum/effect_system/smoke_spread/smoke = new
|
|
smoke.set_up(2, user.loc)
|
|
smoke.attach(user)
|
|
smoke.start()
|
|
var/list/possible_locations = list()
|
|
for(var/turf/target_turf in get_area_turfs(thearea.type))
|
|
if(!target_turf.is_blocked_turf())
|
|
possible_locations += target_turf
|
|
|
|
if(!length(possible_locations))
|
|
to_chat(user, span_warning("The spell matrix was unable to locate a suitable teleport destination for an unknown reason."))
|
|
return
|
|
|
|
if(do_teleport(user, pick(possible_locations), channel = TELEPORT_CHANNEL_MAGIC, forced = TRUE))
|
|
smoke.start()
|
|
uses--
|
|
if(!uses)
|
|
to_chat(user, span_warning("[src] has run out of uses and crumbles to dust!"))
|
|
qdel(src)
|
|
else
|
|
to_chat(user, span_notice("[src] has [uses] use\s remaining."))
|
|
else
|
|
to_chat(user, span_warning("The spell matrix was disrupted by something near the destination."))
|