Skip to content

Commit cc9b122

Browse files
author
Ava
committed
Weapon rune, interact_message, UI improvements
1 parent e53ca70 commit cc9b122

File tree

23 files changed

+76
-25
lines changed

23 files changed

+76
-25
lines changed

‎code/game/gamemodes/cult/arcane_tome.dm‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@
4646
var/obj/effect/rune/NR = V
4747
if (!initial(NR.can_write))
4848
continue
49+
var/obj/item/paper/talisman/T = initial(NR.talisman_path)
4950
rune_data += list(list(
5051
"name" = initial(NR.rune_name),
5152
"invokers" = initial(NR.required_invokers),
52-
"talisman" = initial(NR.talisman_path),
53+
"talisman" = T ? initial(T.tome_desc) : null,
5354
"shorthand" = initial(NR.rune_shorthand) ? initial(NR.rune_shorthand) : initial(NR.rune_desc),
5455
"typepath" = NR
5556
))
@@ -79,12 +80,12 @@
7980
user.setClickCooldown(user.get_attack_speed(src))
8081
user.do_attack_animation(M)
8182
var/hit_zone = M.resolve_item_attack(src, user, target_zone)
82-
if(hit_zone)
83-
user.visible_message(
84-
SPAN_DANGER("\The [user] bathes \the [M] in red light from \the [src]'s cover!"),
83+
if (hit_zone)
84+
M.interact_message(user,
85+
SPAN_DANGER("\The [user] bathes \the [M] in red light from \the [src]!"),
86+
SPAN_DANGER("\The [user] bathes you in burning red light from \the [src]!"),
8587
SPAN_DANGER("You burn \the [M] with \the [src]!")
8688
)
87-
to_chat(M, SPAN_DANGER("You feel a searing heat inside!"))
8889
playsound(src, 'sound/weapons/sear.ogg', 50, TRUE, -1)
8990
M.apply_damage(rand(5, 20), BURN, hit_zone, used_weapon = "internal burns")
9091
return
@@ -104,7 +105,7 @@
104105
blood_name = H.species?.get_blood_name()
105106
user.apply_damage(1, BRUTE, pick(BP_L_HAND, BP_R_HAND), sharp = TRUE, edge = TRUE, used_weapon = "long, precise cut")
106107
user.visible_message(
107-
SPAN_WARNING("\The [user] [!synth ? "slices open [G.his] skin" : "tears open [G.his] circulation"] and begins painting on symbols on the floor with [G.his] own [blood_name]"),
108+
SPAN_WARNING("\The [user] [!synth ? "slices open [G.his] skin" : "tears open [G.his] circulation"] and begins painting on symbols on the floor with [G.his] own [blood_name]!"),
108109
SPAN_NOTICE("You [!synth ? "slice open your skin" : "tear open your circulation"] and begin drawing a rune on the floor whilst invoking the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."),
109110
SPAN_WARNING("You hear droplets softly splattering on the ground."),
110111
range = 3

‎code/game/gamemodes/cult/cult_items.dm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/obj/item/melee/cultblade
22
name = "cult blade"
3-
desc = "An arcane weapon wielded by the followers of an unknown god."
3+
desc = "A wicked sword made of serrated black metal, with a very slightly curving blade evoking a khopesh. The grip is studded with dull spikes."
4+
description_antag = "Through some anomalous means, this weapon refuses to be wielded by any other than the followers of Nar-Sie. Attempting to wield it without being a cultist yourself is like to result in disaster."
45
icon_state = "cultblade"
56
origin_tech = list(TECH_COMBAT = 1, TECH_ARCANE = 1)
67
w_class = ITEMSIZE_LARGE

‎code/game/gamemodes/cult/runes/armor.dm‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
/obj/effect/rune/armor
22
rune_name = "Armor"
3-
rune_desc = "When this rune is invoked, either from a rune or a talisman, it will equip its invoker with the armor of the followers of Nar-Sie. To use this rune to its fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands."
4-
rune_shorthand = "Creates and equips a set of protective robes as well as a sword."
3+
rune_desc = "When this rune is invoked, either from a rune or a talisman, it will equip its invoker with protective robes. To use this rune to its fullest extent, make sure you are not wearing any form of headgear, armor, or shoes."
4+
rune_shorthand = "Creates and equips a set of protective, conspicuous robes."
55
talisman_path = /obj/item/paper/talisman/armor
6-
circle_words = list(CULT_WORD_HELL, CULT_WORD_DESTROY, CULT_WORD_OTHER)
6+
circle_words = list(CULT_WORD_HELL, CULT_WORD_DESTROY, CULT_WORD_SELF)
77
invocation = "Sa tatha najin!"
88

99
/obj/effect/rune/armor/invoke(list/invokers)
1010
var/mob/living/L = invokers[1]
11-
L.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(L), slot_head)
12-
L.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(L), slot_wear_suit)
11+
L.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hooded/cult(L), slot_wear_suit)
1312
L.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(L), slot_shoes)
1413
L.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(L), slot_back)
15-
L.put_in_hands(new /obj/item/melee/cultblade(L))
1614
var/datum/gender/G = gender_datums[L.get_visible_gender()]
1715
L.visible_message(
1816
SPAN_DANGER("The runes crawl onto [L]'s body as they expand to cocoon [G.him], before falling away and revealing [G.his] body once more in gushing spurts of black sludge."),

‎code/game/gamemodes/cult/runes/weapon.dm‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/obj/effect/rune/weapon
2+
rune_name = "Weapon"
3+
rune_desc = "Creates a deadly blade, adept at maiming and dismemberment. It will reject nonbelievers, preventing them from wielding it as a weapon. Use sparingly, for the Geometer disdains bloodshed not executed at Its behest."
4+
circle_words = list(CULT_WORD_HELL, CULT_WORD_DESTROY, CULT_WORD_OTHER)
5+
invocation = "Sa tatha rajin!"
6+
7+
/obj/effect/rune/weapon/invoke(list/invokers)
8+
var/mob/living/L = invokers[1]
9+
var/obj/item/melee/cultblade/C = new (get_turf(src))
10+
L.put_in_active_hand(C)
11+
L.visible_message(
12+
SPAN_DANGER("The runes coalesce into a long, cruel blade, which [L.get_active_hand() == C ? "\the [L] picks up" : "settles on the floor"]."),
13+
SPAN_DANGER("The runes coalesce into a serrated blade[L.get_active_hand() == C ? ", which you pick up" : ""].")
14+
)
15+
qdel(src)

‎code/game/gamemodes/cult/talismans/_talisman.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
var/talisman_name
99
/// A description of what this talisman actually does.
1010
var/talisman_desc
11+
/// Specifically shown in the arcane tome, alongside the rune's description.
12+
var/tome_desc
1113
/// The words spoken by a cultist activating this talisman.
1214
var/invocation = "Look at this photograph!"
1315
/// If true, cultists invoking this talisman will whisper, instead of speaking normally.

‎code/game/gamemodes/cult/talismans/armor.dm‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
/obj/item/paper/talisman/armor
22
talisman_name = "Armor"
33
talisman_desc = "Equips its invoker with a set of followers' armor, equivalent to the rune from which it was drawn."
4+
tome_desc = "Ditto."
45
invocation = "Sa tatha najin!"
56

67
/obj/item/paper/talisman/armor/invoke(mob/living/user)
7-
user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head)
8-
user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit)
8+
user.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hooded/cult(user), slot_wear_suit)
99
user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes)
1010
user.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back)
11-
user.put_in_hands(new /obj/item/melee/cultblade(user))
1211
var/datum/gender/G = gender_datums[user.get_visible_gender()]
1312
user.visible_message(
1413
SPAN_DANGER("\The [src] expands to briefly envelop \the [user]'s body before [G.he] tears through it in a gushing spurt of black sludge."),

‎code/game/gamemodes/cult/talismans/blind.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/obj/item/paper/talisman/blind
22
talisman_name = "Blind"
33
talisman_desc = "Induces blindness in nonbelievers within two tiles."
4+
tome_desc = "Shorter range."
45
invocation = "Sti'kaliesin!"
56

67
/obj/item/paper/talisman/blind/invoke(mob/living/user)

‎code/game/gamemodes/cult/talismans/communicate.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/obj/item/paper/talisman/communicate
22
talisman_name = "Communicate"
33
talisman_desc = "Allows you to communicate with other cultists."
4+
tome_desc = "Send a single message upon invocation."
45
invocation = "O bidai nabora se'sma!"
56
whispered = TRUE
67
delete_self = FALSE

‎code/game/gamemodes/cult/talismans/deafen.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/obj/item/paper/talisman/deafen
22
talisman_name = "Deafen"
33
talisman_desc = "Induces deafness in all nearby nonbelievers."
4+
tome_desc = "Shorter range."
45
invocation = "Sti'kaliedir!"
56

67
/obj/item/paper/talisman/deafen/invoke(mob/living/user)

‎code/game/gamemodes/cult/talismans/emp.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/obj/item/paper/talisman/emp
22
talisman_name = "Disable Technology"
33
talisman_desc = "Emits a strong electromagnetic pulse in a small radius, disabling or harming nearby electronics."
4+
tome_desc = "Shorter range."
45
invocation = "Ta'gh fara'qha fel d'amar det!"
56

67
/obj/item/paper/talisman/emp/invoke(mob/living/user)

0 commit comments

Comments
 (0)