Skip to content

Commit

Permalink
Donator items for Sciamach (#4661)
Browse files Browse the repository at this point in the history
* we do a little donating

* Mal's review

Co-authored-by: Bloop <[email protected]>

* Another adjustment from Sciamach

---------

Co-authored-by: Bloop <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Dec 16, 2024
1 parent 0f8c599 commit adaaf88
Show file tree
Hide file tree
Showing 6 changed files with 239 additions and 5 deletions.
Binary file modified modular_nova/master_files/icons/obj/plushes.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,32 @@
squeak_override = list('modular_nova/modules/emotes/sound/voice/merp.ogg' = 1)
young = FALSE

/obj/item/toy/plush/nova/donator/delphic_synth
name = "surgery synth plushie"
desc = "A plush in the shape of a familiar white synthetic with toggleable holographic wings. It even comes complete with real fake blood stains and a functional mini-syringe! Dont think too hard about how safe it is..."
icon_state = "plushie_delphi"
squeak_override = list('modular_nova/modules/emotes/sound/emotes/dwoop.ogg' = 1)
attack_verb_continuous = list(
"lobotomizes",
"appendectomys",
"transplants",
"amputates",
"vivisects",
"vasotomys",
"myotomys",
"angioectomys",
)
attack_verb_simple = list(
"lobotomize",
"appendectomy",
"transplant",
"amputate",
"vivisect",
"vasotomy",
"myotomy",
"angioectomy",
)

/obj/item/toy/plush/nova/donator/chunko
name = "chunko fop"
desc = "A soulless creature that haunts your dreams."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2045,6 +2045,32 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
desc = "A glass case containing a toaster implant. Sweet."
imp_type = /obj/item/implant/toaster

#undef TOASTER_IMPLANT_COOLDOWN

// donator item for Sciamach
/obj/item/organ/cyberimp/arm/shard/donator/theurgic_crystal
name = "theurgic stone"
desc = "An eerie crystalline shard that pulses with theurgic energies. Tendrils of crimson energy seem to dance along its surface."
icon = 'modular_nova/master_files/icons/donator/obj/custom.dmi'
icon_state = "crystal"
items_to_create = list(/obj/item/knife/razor_claws/donator/theurgic_knife)
extend_sound = 'sound/items/haunted/ghostitemattack.ogg'
retract_sound = 'sound/items/haunted/ghostitemattack.ogg'

/obj/item/knife/razor_claws/donator/theurgic_knife
name = "cursed ritual knife"
desc = "A large carving or flensing dagger made of a heavy, dusty material. It seems to emit a soft, eerie crimson glow."
icon = 'modular_nova/master_files/icons/donator/obj/custom.dmi'
righthand_file = 'modular_nova/modules/modular_ert/icons/pizza/righthand.dmi'
lefthand_file = 'modular_nova/modules/modular_ert/icons/pizza/lefthand.dmi'
icon_state = "dagger"
inhand_icon_state = "hotknife"
toggle_sound = 'sound/items/haunted/ghostitemattack.ogg'

/obj/item/knife/razor_claws/donator/theurgic_knife/attack_self(mob/user)
. = ..()
inhand_icon_state = src::inhand_icon_state // Don't have a precision variant for this, just always use base

// donator reward for ignari
/obj/item/clothing/under/rem
name = "\improper M.I.A. limiter"
Expand Down
11 changes: 6 additions & 5 deletions modular_nova/modules/implants/code/augments_arms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,17 @@
var/cutter_force = CUTTER_FORCE
var/cutter_wound_bonus = CUTTER_WOUND_BONUS
var/cutter_bare_wound_bonus = CUTTER_WOUND_BONUS
var/toggle_sound = 'sound/items/tools/change_drill.ogg'
tool_behaviour = TOOL_KNIFE
toolspeed = 1

/obj/item/knife/razor_claws/attack_self(mob/user)
playsound(get_turf(user), 'sound/items/tools/change_drill.ogg', 50, TRUE)
playsound(get_turf(user), toggle_sound, 50, TRUE)
if(tool_behaviour != TOOL_WIRECUTTER)
tool_behaviour = TOOL_WIRECUTTER
to_chat(user, span_notice("You shift [src] into Precision mode, for wirecutting."))
icon_state = "precision_wolverine"
inhand_icon_state = "precision_wolverine"
icon_state = "precision_[src::icon_state]"
inhand_icon_state = "precision_[src::inhand_icon_state]"
force = cutter_force
wound_bonus = cutter_wound_bonus
bare_wound_bonus = cutter_bare_wound_bonus
Expand All @@ -91,8 +92,8 @@
else
tool_behaviour = TOOL_KNIFE
to_chat(user, span_notice("You shift [src] into Killing mode, for slicing."))
icon_state = "wolverine"
inhand_icon_state = "wolverine"
icon_state = src::icon_state
inhand_icon_state = src::inhand_icon_state
force = knife_force
sharpness = KNIFE_SHARPNESS
wound_bonus = knife_wound_bonus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,184 @@
name = "Holocigar"
item_path = /obj/item/holocigarette/masvedishcigar
// Asked it to be public, and as such has no whitelist.
<<<<<<< HEAD
=======

/datum/loadout_item/suit/lt3_armor
name = "Silver Jacket Mk II"
item_path = /obj/item/clothing/suit/armor/skyy
ckeywhitelist = list("lt3")
restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP)

/datum/loadout_item/suit/lt3_jacket
name = "Silver Jacket"
item_path = /obj/item/clothing/suit/jacket/skyy
ckeywhitelist = list("lt3")

/datum/loadout_item/under/miscellaneous/lt3_jeans
name = "Silver Jeans"
item_path = /obj/item/clothing/under/pants/skyy
ckeywhitelist = list("lt3")

/datum/loadout_item/gloves/lt3_gloves
name = "Charcoal Fingerless Gloves"
item_path = /obj/item/clothing/gloves/skyy
ckeywhitelist = list("lt3")

/datum/loadout_item/toys/switchcomb
name = "Switchblade Comb"
item_path = /obj/item/hairbrush/switchblade
ckeywhitelist = list("stonetear")

/datum/loadout_item/suit/colorblockhoodie
name = "Color-Block Hoodie"
item_path = /obj/item/clothing/suit/hooded/colorblockhoodie
ckeywhitelist = list("lolpopomg101")

/datum/loadout_item/inhand/officialcat
name = "Official Cat Stamp"
item_path = /obj/item/stamp/cat
ckeywhitelist = list("kathrinbailey")

/datum/loadout_item/inhand/sqn_box
name = "A curious box of things."
item_path = /obj/item/storage/box/donator/sqn
ckeywhitelist = list("sqnztb")

/datum/loadout_item/under/jumpsuit/noble_gambeson
name = "Noble Gambeson"
item_path = /obj/item/clothing/under/rank/civilian/chaplain/divine_archer/noble
ckeywhitelist = list("grasshand")

/datum/loadout_item/shoes/noble_boots
name = "Noble Boots"
item_path = /obj/item/clothing/shoes/jackboots/noble
ckeywhitelist = list("grasshand")

/datum/loadout_item/suit/nobility_dresscoat
name = "Nobility Dresscoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/vic_dresscoat_donator
ckeywhitelist = list("nikotheguydude")

/datum/loadout_item/suit/anubite_headpiece
name = "Anubite Headpiece"
item_path = /obj/item/clothing/head/anubite
ckeywhitelist = list("vexcint")

/datum/loadout_item/under/formal/dragon_maid
name = "Dragon Maid Uniform"
item_path = /obj/item/clothing/under/costume/dragon_maid
ckeywhitelist = list("sigmaralkahest")

/datum/loadout_item/head/catear_headphone
name = "Cat-Ear Headphones"
item_path = /obj/item/instrument/piano_synth/headphones/catear_headphone
ckeywhitelist = list("dtfe")

/datum/loadout_item/neck/trenchcoat
name = "Secure Trenchcoat"
item_path = /obj/item/clothing/neck/trenchcoat
ckeywhitelist = list("Smol42")

/datum/loadout_item/under/jumpsuit/old_qm_jumpskirt
name = "Old Quartermaster's Jumpskirt"
item_path = /obj/item/clothing/under/rank/cargo/qm/skirt/old
ckeywhitelist = list("jasohavents")

/datum/loadout_item/pocket_items/toaster_implant
name = "Toaster Implant"
item_path = /obj/item/implanter/toaster
ckeywhitelist = list("jasohavents")

/datum/loadout_item/pocket_items/theurgic_crystal
name = "Theurgic Stone"
item_path = /obj/item/organ/cyberimp/arm/shard/donator/theurgic_crystal
ckeywhitelist = list("sciamach")

/datum/loadout_item/toys/delphic_synth
name = "Surgery Synth Plushie"
item_path = /obj/item/toy/plush/nova/donator/delphic_synth
ckeywhitelist = list("sciamach")

/datum/loadout_item/under/miscellaneous/rem
name = "M.I.A. Limiter"
item_path = /obj/item/clothing/under/rem
ckeywhitelist = list("ignari")

/datum/loadout_item/shoes/rem
name = "M.I.A. Heels"
item_path = /obj/item/clothing/shoes/rem_shoes
ckeywhitelist = list("ignari")

/datum/loadout_item/under/miscellaneous/bwake
name = "Compression Bodysuit"
item_path = /obj/item/clothing/under/bwake
ckeywhitelist = list("ignari")

/datum/loadout_item/inhand/pet/mrfluff_mothroach
name = "Mr. Fluff"
item_path = /obj/item/clothing/head/mob_holder/pet/donator/centralsmith
ckeywhitelist = list("centralsmith")

/datum/loadout_item/under/jumpsuit/techpants
name = "Techwear Pants"
item_path = /obj/item/clothing/under/techpants
ckeywhitelist = list("alvcyktor", "snakebittenn")

/datum/loadout_item/inhand/drop_pouch
name = "Drop Pouch"
item_path = /obj/item/storage/backpack/satchel/drop_pouch
ckeywhitelist = list("alvcyktor", "snakebittenn")

/datum/loadout_item/inhand/melonseva
name = "Sundowner SEVA"
item_path = /obj/item/clothing/suit/hooded/seva/melon
ckeywhitelist = list("deadmonwonderland")
restricted_roles = list(JOB_SHAFT_MINER)


/datum/loadout_item/suit/desminus
name = "Jómsvíking Coat"
item_path = /obj/item/clothing/suit/toggle/desminus
ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland")

/datum/loadout_item/suit/desminus2
name = "Elderwood Garment"
item_path = /obj/item/clothing/suit/toggle/desminus2
ckeywhitelist = list("desminus", "junglerat", "deadmonwonderland")

/datum/loadout_item/pocket_items/akarimod
name = "Akari's MOD Refitter"
item_path = /obj/item/mod/skin_applier/akari
ckeywhitelist = list("samman166", "cainedclxvi")

/datum/loadout_item/pocket_items/mrsanderp_cookbook
name = "Riva Family Cookbook"
item_path = /obj/item/book/granter/crafting_recipe/mrsanderp_donator_cookbook
ckeywhitelist = list("mrsanderp")

/datum/loadout_item/under/jumpsuit/half_leotard
name = "One-Sleeved Leotard"
item_path = /obj/item/clothing/under/pants/half_leotard_cosmiclaer
ckeywhitelist = list("cosmiclaer")

/datum/loadout_item/under/jumpsuit/shendyt
name = "Shendyt"
item_path = /obj/item/clothing/under/costume/shendyt
ckeywhitelist = list("hyperhazel")

/datum/loadout_item/pocket_items/jumperbox
name = "Jumper Conversation Kit Box"
item_path = /obj/item/mod/skin_applier/jumper
ckeywhitelist = list("bonkaitheroris")

/datum/loadout_item/pocket_items/starfruit_seed
name = "Primidine Starfruit Seed"
item_path = /obj/item/seeds/starfruit
ckeywhitelist = list("snailomi", "thedragmeme", "DayDream21", "Sketchy_Axoltol", "Tesla825")

/datum/loadout_item/suit/butter
name = "Butter Costume"
item_path = /obj/item/clothing/suit/costume/butter
ckeywhitelist = list("drpmstr", "pyritechimera")
>>>>>>> d330e22ad90 (Donator items for Sciamach (#4661))
Binary file modified modular_nova/modules/modular_ert/icons/pizza/righthand.dmi
Binary file not shown.

0 comments on commit adaaf88

Please sign in to comment.