Merge pull request #3234 from Kelprunner/tiny-kelp-tweaks

Sabal's Custom Kit (And minor grammar fixes) (Good to go if it passes checks)
ARF-SS13 · Oct 1, 2023 · 25f7d14 · 25f7d14
2 parents 26d94ae + dcd8574
commit 25f7d14
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
@@ -706,7 +706,7 @@
 	desc = "By the Nine- Wait, wrong game. One way or another you can lay on hands."
 	value = 0
 	category = "Healer Quirks"
-	mechanics = "Your touch has a mild healing effect on burns and bruises. Use *touch to sooth the injuries of yourself or others. Drinking water helps recover from the fatigue of using the spell faster."
+	mechanics = "Your touch has a mild healing effect on burns and bruises. Use *touch to soothe the injuries of yourself or others. Drinking water helps recover from the fatigue of using the spell faster."
 	conflicts = list()
 	mob_trait = TRAIT_HEAL_TOUCH
 	gain_text = span_notice("You feel a slight tingle in your hands.")

diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
@@ -896,3 +896,14 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
 	if(!Kisser)
 		return
 	plushie_absorb(Kisser)
+
+// Bayou plushes I guess?
+
+/obj/item/toy/plush/rattler
+	name = "Rattles Jr."
+	desc = "It's your friendly neighborhood merchant, Rattles! It looks like he's been turned into a marketable plushie."
+	icon_state = "rattles"
+	item_state = "plushie_lizard"
+	attack_verb = list("hissed", "rattled")
+	squeak_override = list('sound/creatures/rattle.ogg' = 1)
+
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
@@ -455,11 +455,11 @@
 /obj/item/stack/medical/bruise_pack/lick/touch
 	name = "magic healing"
 	singular_name = "magic healing"
-	desc = "A mystical source of healing that draws from an unknown source of power to sooth mild wounds."
+	desc = "A mystical source of healing that draws from an unknown source of power to soothe mild wounds."
 	too_dry = "Your well of magical energy feels dry. A break will help. Drinking some water would help too."
 	third_person_verb = "touching"
 	action_verb = "touch"
-	action_verb_2 = "magically sooth"
+	action_verb_2 = "magically soothe"
 	end_sound = 'sound/effects/healingtouch.ogg'
 
 /obj/item/stack/medical/bruise_pack/lick/tend

diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -1535,6 +1535,20 @@
 	new /obj/item/storage/firstaid/emergency(src)
 	new /obj/item/defibrillator/compact(src)
 
+/datum/gear/donator/kits/rattles
+	name = "Box of Rattlers"
+	path = /obj/item/storage/box/large/custom_kit/kelprunner
+	ckeywhitelist = list("sabals")
+
+/obj/item/storage/box/large/custom_kit/rattles/PopulateContents()
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+	new /obj/item/toy/plush/rattler(src)
+
 /datum/gear/donator/kits/lucine3
 	name = "Gob-lyn Muderbox"
 	path = /obj/item/storage/box/large/custom_kit/lucine3