Merge remote-tracking branch 'origin/master' into TGUI-4

code/game/objects/items/armor_kits.dm

@@ -0,0 +1,44 @@
+// Armor kits! Reinforcing uniforms to maintain fashion and also armor capabilities.
+
+/obj/item/armorkit
+	name = "durathread armor kit"
+	desc = "A glorified sewing kit with durathread sheets, thread, and a titanium needle, for reinforcing jumpsuits and uniforms."
+	icon = 'icons/obj/clothing/reinf_kits.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	icon_state = "durathread_kit" // shoutout to my guy Toriate for being good at sprites tho
+
+/obj/item/armorkit/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	// yeah have fun making subtypes and modifying the afterattack if you want to make variants
+	// idiot
+	// - hatter
+	var/used = FALSE
+
+	if(isobj(target) && istype(target, /obj/item/clothing/under))
+		var/obj/item/clothing/under/C = target
+		if(C.armor.melee < 10)
+			C.armor.melee = 10
+			used = TRUE
+		if(C.armor.laser < 10)
+			C.armor.laser = 10
+			used = TRUE
+		if(C.armor.fire < 40)
+			C.armor.fire = 40
+			used = TRUE
+		if(C.armor.acid < 10)
+			C.armor.acid = 10
+			used = TRUE
+		if(C.armor.bomb < 5)
+			C.armor.bomb = 5
+			used = TRUE
+
+		if(used)
+			user.visible_message("<span class = 'notice'>[user] uses [src] on [C], reinforcing it and tossing the empty case away afterwards.</span>", \
+			"<span class = 'notice'>You reinforce [C] with [src], making it a little more protective! You toss the empty casing away afterwards.</span>")
+			C.name = "durathread [C.name]" // this disappears if it gets repaired, which is annoying
+			qdel(src)
+			return
+		else
+			to_chat(user, "<span class = 'notice'>You stare at [src] and [C], coming to the conclusion that you probably don't need to reinforce it any further.")
+			return
+	else
+		return

code/game/objects/items/devices/multitool.dm

@@ -263,3 +263,11 @@
 	icon = 'icons/obj/advancedtools.dmi'
 	icon_state = "multitool"
 	toolspeed = 0.2
+
+/obj/item/multitool/advanced/brass
+	name = "clockwork multitool"
+	desc = "A brass...multitool? With three prongs arcing electricity between them. It vibrates subtly in your hand."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "clockitool"
+	toolspeed = 0.2
+

code/game/objects/items/granters.dm

@@ -477,6 +477,23 @@
 		name = "empty scroll"
 		icon_state = "blankscroll"
 
+/obj/item/book/granter/martial/krav_maga
+	martial = /datum/martial_art/krav_maga
+	name = "parchment scroll"
+	martialname = "krav maga"
+	desc = "A worn parchment scrap written in an ancient language. Somehow you can still understand the lessons!"
+	greet = "<span class='sciradio'>You have learned the ancient martial art of Krav Maga. You have special attacks with which to take down your foes.</span>"
+	icon = 'icons/obj/wizard.dmi'
+	icon_state ="scroll2"
+	remarks = list("Sweep the legs...", "Chop the throat...", "Punch the lungs...", "Get the gold...", "Where are my sick gloves..?")
+
+/obj/item/book/granter/martial/krav_maga/onlearned(mob/living/carbon/user)
+	. = ..()
+	if(oneuse == TRUE)
+		desc = "It's completely blank."
+		name = "empty scroll"
+		icon_state = "blankscroll"
+
 // I did not include mushpunch's grant, it is not a book and the item does it just fine.
 
 

code/game/objects/items/storage/belt.dm

@@ -120,7 +120,7 @@
 	new /obj/item/wrench/brass(src)
 	new /obj/item/crowbar/brass(src)
 	new /obj/item/weldingtool/experimental/brass(src)
-	new /obj/item/multitool(src)
+	new /obj/item/multitool/advanced/brass(src)
 	new /obj/item/stack/cable_coil(src, 30, "yellow")
 
 /obj/item/storage/belt/medical

code/game/objects/items/toys.dm

@@ -1230,7 +1230,7 @@
 	name = "steampunk watch"
 	desc = "A stylish steampunk watch made out of thousands of tiny cogwheels."
 	icon = 'icons/obj/clockwork_objects.dmi'
-	icon_state = "dread_ipad"
+	icon_state = "clockwork_slab"
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	var/cooldown = 0