Skip to content

Commit 8eb46f4

Browse files
author
Ava
committed
Proofreading, extra spoops
1 parent 513cef5 commit 8eb46f4

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

code/game/gamemodes/cult/cult_items.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
to_chat(user, SPAN_WARNING("An overwhelming feeling of dread comes over you as you pick up \the [src]. It would be wise to be rid of this blade quickly."))
4848
user.make_dizzy(120)
4949
else if (isconstruct(user))
50-
to_chat(user, SPAN_WARNING("The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly."))
50+
to_chat(user, SPAN_WARNING("\The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly."))
5151

5252

5353
// Actual cultists spawn with a hooded variant found in hooded.dm; everything below here is legacy for older maps, and has yet to be gutted

code/game/gamemodes/cult/runes/astral_journey.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
/obj/effect/rune/astral_journey/proc/set_traveler(mob/living/L, return_to_body)
3434
if (!L)
3535
if (traveler)
36-
traveler.ajourn = FALSE
3736
if (return_to_body && ghost)
3837
if (ghost.reenter_corpse())
3938
to_chat(ghost, SPAN_DANGER("You are painfully jerked back to reality as the binding sigils force you back into your body."))
@@ -47,7 +46,6 @@
4746
STOP_PROCESSING(SSprocessing, src)
4847
else
4948
traveler = L
50-
traveler.ajourn = TRUE
5149
ghost = traveler.ghostize(TRUE)
5250
ghost.forbid_seeing_deadchat = TRUE
5351
ghost.name = "???"

code/game/gamemodes/cult/runes/convert.dm

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
var/impudence_timer = 0
1111

1212
/obj/effect/rune/convert/proc/can_convert(mob/living/victim)
13-
return !iscultist(victim) && victim.client && victim.stat != DEAD && victim.mind
13+
return victim && !iscultist(victim) && victim.client && victim.stat != DEAD && victim.mind
1414

1515
/obj/effect/rune/convert/can_invoke(mob/living/invoker)
1616
for (var/mob/living/L in get_turf(src))
@@ -48,9 +48,9 @@
4848
process()
4949

5050
/obj/effect/rune/convert/process()
51-
if (!converting || !converting.mind || !converting.client || !can_convert(converting) || !cult.can_become_antag(converting.mind) || get_turf(converting) != get_turf(src))
52-
if (!converting)
53-
to_chat(converting, SPAN_DANGER("And then, just like that, it was gone. The blackness recedes, and you are yourself again."))
51+
if (!can_convert(converting) || !cult.can_become_antag(converting.mind) || get_turf(converting) != get_turf(src))
52+
if (converting)
53+
to_chat(converting, SPAN_DANGER("And then, just like that, it was gone. The blackness slowly recedes, and you are yourself again. It has taken something precious from you."))
5454
converting = null
5555
waiting_for_input = FALSE
5656
STOP_PROCESSING(SSprocessing, src)
@@ -71,8 +71,6 @@
7171
converting = null
7272
STOP_PROCESSING(SSprocessing, src)
7373
if (impudence)
74-
var/prev_color = converting.client.color
75-
animate(converting.client, converting.client.color = COLOR_RED, converting.client.color = prev_color, time = 8 SECONDS)
7674
converting.take_overall_damage(0, min(5 * impudence, 20))
7775
switch (converting.getFireLoss())
7876
if (0 to 25)

code/game/gamemodes/cult/runes/summon_cultist.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
if (choice && !can_summon(choice))
3333
var/datum/gender/G = gender_datums[choice.get_gender()]
3434
for (var/mob/living/L2 in invokers)
35-
to_chat(L2, SPAN_WARNING("You cannot summon [choice], for [G.he] [G.is] bound in place. You must free [G.him] first."))
35+
to_chat(L2, SPAN_WARNING("You cannot summon \the [choice], for [G.he] [G.is] bound in place. You must free [G.him] first."))
3636
for (var/mob/living/C in invokers)
3737
to_chat(C, SPAN_DANGER("You reach out together through space, dragging [choice] to your location."))
3838
C.take_overall_damage(round(25 / invokers.len), 0)
@@ -50,7 +50,7 @@
5050
choice.lying = TRUE
5151
choice.regenerate_icons()
5252
choice.visible_message(
53-
SPAN_WARNING("The runes bubble, and [choice] is thrust through them onto the ground!"),
53+
SPAN_WARNING("The runes bubble, and \the [choice] is thrust through them onto the ground!"),
5454
SPAN_DANGER("...and you emerge on top of the runes they used to bring you forth.")
5555
)
5656
qdel(src)

code/modules/mob/dead/observer/observer.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
268268
if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients
269269
to_chat(usr, "<span class='warning'>Another consciousness is in your body... it is resisting you.</span>")
270270
return
271-
mind.current.ajourn=0
272271
mind.current.key = key
273272
mind.current.teleop = null
274273
if(istype(mind.current.loc, /obj/structure/morgue))

code/modules/mob/mob_defines.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
var/exploit_record = ""
7474
var/exploit_addons = list() //Assorted things that show up at the end of the exploit_record list
7575
var/blinded = null
76-
var/bhunger = 0 //Carbon
77-
var/ajourn = 0
7876
var/druggy = 0 //Carbon
7977
var/confused = 0 //Carbon
8078
var/antitoxs = null

0 commit comments

Comments
 (0)