This commit is contained in:
TrilbySpaceClone
2019-07-29 07:28:38 -04:00
parent 606639ce23
commit 7ca32cd97f
14 changed files with 54 additions and 7 deletions

View File

@@ -41,8 +41,6 @@
if(reading)
to_chat(user, "<span class='warning'>You're already reading this!</span>")
return FALSE
if(!user.can_read(src))
return FALSE
if(already_known(user))
return FALSE
if(used && oneuse)
@@ -84,6 +82,31 @@
G.Grant(user)
onlearned(user)
/obj/item/book/granter/action/drink_fling
granted_action = /datum/action/innate/drink_fling
name = "Tapper: This One's For You"
desc = "A seminal work on the dying art of booze sliding."
icon_state = "barbook"
actionname = "drink flinging"
oneuse = FALSE
remarks = list("The trick is keeping a low center of gravity it seems...", "The viscosity of the liquid is important...", "Accounting for crosswinds... really?", "Drag coefficients of various popular drinking glasses...", "What the heck is laminar flow and why does it matter here?", "Greasing the bar seems like it'd be cheating...", "I don't think I'll be working with superfluids...")
/datum/action/innate/drink_fling
name = "Drink Flinging"
desc = "Toggles your ability to satisfyingly throw glasses without spilling them."
button_icon_state = "drinkfling_off"
check_flags = 0
/datum/action/innate/drink_fling/Activate()
button_icon_state = "drinkfling_on"
active = TRUE
UpdateButtonIcon()
/datum/action/innate/drink_fling/Deactivate()
button_icon_state = "drinkfling_off"
active = FALSE
UpdateButtonIcon()
/obj/item/book/granter/action/origami
granted_action = /datum/action/innate/origami
name = "The Art of Origami"
@@ -181,9 +204,9 @@
..()
to_chat(user,"<span class='caution'>Your stomach rumbles...</span>")
if(user.nutrition)
user.set_nutrition(200)
user.nutrition = 200
if(user.nutrition <= 0)
user.set_nutrition(0)
user.nutrition = 0
/obj/item/book/granter/spell/blind
spell = /obj/effect/proc_holder/spell/targeted/trigger/blind
@@ -315,7 +338,6 @@
var/martialname = "bug jitsu"
var/greet = "You feel like you have mastered the art in breaking code. Nice work, jackass."
/obj/item/book/granter/martial/already_known(mob/user)
if(!martial)
return TRUE
@@ -408,4 +430,4 @@
for(var/crafting_recipe_type in crafting_recipe_types)
var/datum/crafting_recipe/R = crafting_recipe_type
user.mind.teach_crafting_recipe(crafting_recipe_type)
to_chat(user,"<span class='notice'>You learned how to make [initial(R.name)].</span>")
to_chat(user,"<span class='notice'>You learned how to make [initial(R.name)].</span>")

View File

@@ -21,7 +21,7 @@
return
if(!H.mind)
return
if(istype(H.mind.martial_art, /datum/martial_art/krav_maga))
if(H.mind.has_martialart(MARTIALART_KRAVMAGA))
style.remove(H)
else
style.teach(H,1)