Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442

[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!

code/datums/martial/cqc.dm

@@ -194,21 +194,5 @@
 	to_chat(usr, "<span class='notice'>Restrain</span>: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a choke hold.")
 	to_chat(usr, "<span class='notice'>Pressure</span>: Disarm Grab. Decent stamina damage.")
 	to_chat(usr, "<span class='notice'>Consecutive CQC</span>: Disarm Disarm Harm. Mainly offensive move, huge damage and decent stamina damage.")
-		
+
 	to_chat(usr, "<b><i>In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.</i></b>")
-
-/obj/item/cqc_manual
-	name = "old manual"
-	desc = "A small, black manual. There are drawn instructions of tactical hand-to-hand combat."
-	icon = 'icons/obj/library.dmi'
-	icon_state ="cqcmanual"
-
-/obj/item/cqc_manual/attack_self(mob/living/carbon/human/user)
-	if(!istype(user) || !user)
-		return
-	to_chat(user, "<span class='boldannounce'>You remember the basics of CQC.</span>")
-	var/datum/martial_art/cqc/D = new(null)
-	D.teach(user)
-	visible_message("<span class='warning'>[src] beeps ominously, and a moment later it bursts up in flames.</span>")
-	qdel(src)
-	new /obj/effect/decal/cleanable/ash(user.drop_location())

code/datums/martial/mushpunch.dm

@@ -21,7 +21,7 @@
 	return TRUE
 
 /obj/item/mushpunch
-	name = "mysterious mushroom"
+	name = "odd mushroom"
 	desc = "<I>Sapienza Ophioglossoides</I>:An odd mushroom from the flesh of a mushroom person. it has apparently retained some innate power of it's owner, as it quivers with barely-contained POWER!"
 	icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	icon_state = "mycelium-angel"

code/datums/martial/plasma_fist.dm

@@ -92,23 +92,3 @@
 	to_chat(usr, "<span class='notice'>Tornado Sweep</span>: Harm Harm Disarm. Repulses target and everyone back.")
 	to_chat(usr, "<span class='notice'>Throwback</span>: Disarm Harm Disarm. Throws the target and an item at them.")
 	to_chat(usr, "<span class='notice'>The Plasma Fist</span>: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.")
-
-/obj/item/plasma_fist_scroll
-	name = "frayed scroll"
-	desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state ="scroll2"
-	var/used = 0
-
-/obj/item/plasma_fist_scroll/attack_self(mob/user)
-	if(!ishuman(user))
-		return
-	if(!used)
-		var/mob/living/carbon/human/H = user
-		var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null)
-		F.teach(H)
-		to_chat(H, "<span class='boldannounce'>You have learned the ancient martial art of Plasma Fist.</span>")
-		used = 1
-		desc = "It's completely blank."
-		name = "empty scroll"
-		icon_state = "blankscroll"

code/datums/martial/sleeping_carp.dm

@@ -156,24 +156,6 @@
 	to_chat(usr, "<span class='notice'>Head Kick</span>: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.")
 	to_chat(usr, "<span class='notice'>Elbow Drop</span>: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.")
 
-/obj/item/sleeping_carp_scroll
-	name = "mysterious scroll"
-	desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "scroll2"
-
-/obj/item/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user)
-	if(!istype(user) || !user)
-		return
-	var/message = "<span class='sciradio'>You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
-	directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.</span>"
-	to_chat(user, message)
-	var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
-	theSleepingCarp.teach(user)
-	qdel(src)
-	visible_message("<span class='warning'>[src] lights up in fire and quickly burns to ash.</span>")
-	new /obj/effect/decal/cleanable/ash(user.drop_location())
-
 /obj/item/twohanded/bostaff
 	name = "bo staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."