TGS Test merge #14709

Author: Yogbot-13

code/__DEFINES/melee.dm

@@ -12,6 +12,9 @@
 #define MARTIALART_FLYINGFANG "flying fang"
 #define MARTIALART_HUNTERFU "hunterfu"
 #define MARTIALART_FRENZYGRAB "frenzy grabbing"
+#define MARTIALART_PRETERNISSTEALTH "preternis stealth"
+#define MARTIALART_EXPLOSIVEFIST "explosive fist"
+#define MARTIALART_GARDENWARFARE "garden warfare"
 
 
 //Weapon stat defines

code/_onclick/hud/blob_overmind.dm

@@ -175,3 +175,4 @@
 	using = new /obj/screen/blob/RelocateCore()
 	using.screen_loc = ui_storage2
 	static_inventory += using
+

code/datums/martial.dm

@@ -209,4 +209,4 @@
 /datum/martial_art/proc/on_remove(mob/living/carbon/human/H)
 	if(help_verb)
 		remove_verb(H, help_verb)
-	return
+	return

code/game/objects/items/granters.dm

@@ -419,6 +419,72 @@
 		name = "empty scroll"
 		icon_state = "blankscroll"
 
+/obj/item/book/granter/martial/preternis_stealth
+	martial = /datum/martial_art/stealth
+	name = "strange electronic board"
+	martialname = "Stealth"
+	desc = "A strange electronic board, containing some sort of software."
+	greet = "<span class='sciradio'>You have uploaded some combat modules into yourself. Your combos will now have special effects on your enemies, and mostly are not obvious to other people. \
+	You can check what combos can you do, and their effect by using Refresh Data verb in Combat Modules tab.</span>"
+	icon = 'icons/obj/module.dmi'
+	icon_state = "cyborg_upgrade"
+	remarks = list("Processing data...")
+
+/obj/item/book/granter/martial/preternis_stealth/already_known(mob/user)
+	if(!ispreternis(user))
+		to_chat(user, span_warning("You don't understand what to do with this strange electronic device."))
+		return TRUE
+	return ..()
+
+/obj/item/book/granter/martial/preternis_stealth/onlearned(mob/living/carbon/user)
+	..()
+	if(oneuse == TRUE)
+		desc = "It looks like it doesn't contain any data no more."
+
+/obj/item/book/granter/martial/garden_warfare
+	martial = /datum/martial_art/gardern_warfare
+	name = "mysterious scroll"
+	martialname = "Garden Warfare"
+	desc = "A scroll, filled with a tone of text. Looks like it says something about combat and... plants?"
+	greet = "<span class='sciradio'>You know the martial art of Garden Warfare! Now you control your body better, then other phytosians do, allowing you to extend vines from your body and impale people with splinters. \
+	You can check what combos can you do, and their effect by using Remember the basics verb in Garden Warfare tab.</span>"
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "scroll2"
+	remarks = list("I didn't know that my body grows sprinklers...", "I am able to snatch people with vines? Interesting.", "Wow, strangling people is brutal.")   ///Kill me please for this cringe
+
+/obj/item/book/granter/martial/garden_warfare/already_known(mob/user)
+	if(!ispodperson(user))
+		to_chat(user, span_warning("You see that this scroll says something about natural abilitites of podpeople, but, unfortunately, you are not one of them."))
+		return TRUE
+	return ..()
+
+/obj/item/book/granter/martial/garden_warfare/onlearned(mob/living/carbon/user)
+	..()
+	if(oneuse == TRUE)
+		desc = "It's completely blank."
+
+/obj/item/book/granter/martial/explosive_fist
+	martial = /datum/martial_art/explosive_fist
+	name = "burnt scroll"
+	martialname = "Explosive Fist"
+	desc = "A burnt scroll, that glorifies plasmamen, and also says a lot things of explosions."
+	greet = "<span class='sciradio'>You know the martial art of Explosive Fist. Now your attacks deal brute and burn damage, while your combos are able to set people on fire, explode them, or all at once. \
+	You can check what combos can you do, and their effect by using Remember the basics verb in Explosive Fist tab.</span>"
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "scroll2"
+	remarks = list("Set them on fire...", "Show the punny humans who is here the supreme race...", "Make them burn...", "Explosion are cool!")
+
+/obj/item/book/granter/martial/explosive_fist/already_known(mob/user)
+	if(!isplasmaman(user))
+		to_chat(user, span_warning("It says about very dangerous things, that you would prefer not to know."))
+		return TRUE
+	return ..()
+
+/obj/item/book/granter/martial/explosive_fist/onlearned(mob/living/carbon/user)
+	..()
+	if(oneuse == TRUE)
+		desc = "It's completely blank."
+
 // I did not include mushpunch's grant, it is not a book and the item does it just fine.
 
 

yogstation.dme

@@ -3382,6 +3382,9 @@
 #include "yogstation\code\datums\diseases\advance\symptoms\confusion.dm"
 #include "yogstation\code\datums\diseases\advance\symptoms\heal.dm"
 #include "yogstation\code\datums\looping_sounds\darkspawn.dm"
+#include "yogstation\code\datums\martial\explosive_fist.dm"
+#include "yogstation\code\datums\martial\garden_warfare.dm"
+#include "yogstation\code\datums\martial\stealth.dm"
 #include "yogstation\code\datums\mood_events\generic_positive_events.dm"
 #include "yogstation\code\datums\mutations\alcohol.dm"
 #include "yogstation\code\datums\mutations\extendoarm.dm"