cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dictionary Hotfix (#33486)

Browse Source
This commit is contained in:
Kurfursten
2022-10-11 18:52:16 -05:00
committed by GitHub
parent 312e12fa22
commit 6bdd132a9e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/trader/trade_gear.dm
View File

@@ -21,6 +21,8 @@
inhand_states = list("left_hand" = 'icons/mob/in-hand/left/books.dmi', "right_hand" = 'icons/mob/in-hand/right/books.dmi') inhand_states = list("left_hand" = 'icons/mob/in-hand/left/books.dmi', "right_hand" = 'icons/mob/in-hand/right/books.dmi')
item_state = "book" item_state = "book"
var/busy = FALSE
var/mob/living/owner var/mob/living/owner
var/datum/language/tongue var/datum/language/tongue
var/progress = 0 var/progress = 0
@@ -47,6 +49,8 @@
if(!tongue) if(!tongue)
to_chat(user,"<span class='danger'>This nanodictionary is blank!</span>") to_chat(user,"<span class='danger'>This nanodictionary is blank!</span>")
return return
if(busy)
return
if(tongue in user.languages) if(tongue in user.languages)
to_chat(user,"<span class='danger'>You already know this language!</span>") to_chat(user,"<span class='danger'>You already know this language!</span>")
return return
@@ -55,7 +59,8 @@
if(master != user) if(master != user)
to_chat(user,"<span class='danger'>This nanodictionary is already partially used up. Useless. You need the fundamentals.</span>.") to_chat(user,"<span class='danger'>This nanodictionary is already partially used up. Useless. You need the fundamentals.</span>.")
return return
if(do_after(user,src,progress_time, 10, custom_checks = new /callback(src, /obj/item/dictionary/proc/on_do_after))) busy = TRUE
if(do_after(user, src,progress_time, 10, custom_checks = new /callback(src, /obj/item/dictionary/proc/on_do_after)))
if(prob(progress_fail_chance)) if(prob(progress_fail_chance))
to_chat(user,"<span class='danger'>Although you practiced your hardest, you didn't make any progress</span>.") to_chat(user,"<span class='danger'>Although you practiced your hardest, you didn't make any progress</span>.")
else else
@@ -66,11 +71,13 @@
to_chat(user,"<span class='good'>You have mastered the language!</span>") to_chat(user,"<span class='good'>You have mastered the language!</span>")
user.languages += tongue user.languages += tongue
qdel(src) qdel(src)
busy = FALSE
/obj/item/dictionary/proc/on_do_after(mob/user, use_user_turf, user_original_location, atom/target, target_original_location, needhand, obj/item/originally_held_item) /obj/item/dictionary/proc/on_do_after(mob/user, use_user_turf, user_original_location, atom/target, target_original_location, needhand, obj/item/originally_held_item)
if(prob(35)) . = do_after_default_checks(arglist(args))
if(. && prob(35))
practice(user) practice(user)
return do_after_default_checks(arglist(args)) return .
/obj/item/dictionary/proc/practice(mob/user) /obj/item/dictionary/proc/practice(mob/user)
var/phrase var/phrase