This commit is contained in:
gavla
2026-06-11 15:07:48 -04:00
committed by nevimer
parent ed9004f120
commit 9bc638dcfb
5 changed files with 10 additions and 7 deletions
@@ -16,7 +16,7 @@
/datum/chemical_reaction/medicine/taste_suppressor
results = list(/datum/reagent/medicine/taste_suppressor = 3)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/sulfur = 1, /datum/reagent/water = 1)
required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/water/salt = 1)
mix_message = "The mixture becomes clear like water."
@@ -1,16 +1,19 @@
//This is a crafting override for the regal condor.
/datum/crafting_recipe/deagle_prime
reqs = list(
/obj/item/gun/ballistic/automatic/pistol = 1,
/obj/item/gun/ballistic/automatic/pistol = 1, //marakov (7 TC)
/obj/item/stack/sheet/mineral/gold = 25,
/obj/item/stack/sheet/mineral/silver = 25,
/obj/item/food/donkpocket = 1,
/obj/item/weaponcrafting/gunkit/regal_condor = 1, //we replace the 4tc with an uplink item that costs 4tc and is restricted
/obj/item/clothing/head/costume/crown/fancy = 1,
/obj/item/storage/toolbox/syndicate = 1,
/obj/item/storage/toolbox/syndicate = 1, //toolbox (1 TC)
/obj/item/stack/sheet/iron = 10,
)
/datum/crafting_recipe/deagle_prime_mag
crafting_flags = CRAFT_SKIP_MATERIALS_PARITY //for the unit test, this recipe is has custom materials like the original.
reqs = list(
/obj/item/stack/sheet/iron = 10,
/obj/item/stack/sheet/mineral/gold = 10,
@@ -1,7 +1,7 @@
/datum/quirk/permanent_limp
/datum/quirk/permanent_limp //As it turns out, upstream now has a limping quirk. (/datum/quirk/item_quirk/limper). Feel free to nuke this quirk to reduce redundancy.
name = "Permanent Limp"
desc = "One of your legs has a permanent limp."
icon = FA_ICON_PERSON_CANE
icon = FA_ICON_PERSON_WALKING_WITH_CANE
value = -3
gain_text = "You start to walk with a limp"
lose_text = "Your limp is cured"
@@ -88,7 +88,7 @@ means that you'll be forced to move carefully while it's on. Fits in pockets, an
on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \
effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune, /obj/effect/cosmic_rune), \
)
AddComponent(/datum/component/bane, target_type = /mob/living/basic/revenant, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
AddComponent(/datum/component/bane, affected_biotypes = MOB_SPIRIT, added_damage = 30)
/obj/item/dualsaber/chaplain/proc/on_cult_rune_removed(obj/effect/target, mob/living/user)
if(!istype(target, /obj/effect/rune))
@@ -1,2 +1,2 @@
/datum/species/ghost/get_species_description()
/datum/species/spirit/get_species_description()
return list("Spirits are spirits of long-dead creatures whom, for one reason or another, still roam around.")