Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sabal's Custom Kit (And minor grammar fixes) (Good to go if it passes checks) #3234

Merged
merged 1 commit into from
Oct 1, 2023
Merged

Sabal's Custom Kit (And minor grammar fixes) (Good to go if it passes checks) #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/traits/neutral.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

4 changes: 2 additions & 2 deletions code/game/objects/items/stacks/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/plushes.dmi
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions modular_citadel/code/modules/client/loadout/__donator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down