-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Cult Pass:This is why we cannot have nice things #7345
Changes from 17 commits
15375c8
12c4c30
d0ca483
b3a7c59
e8c77b9
b7f43cd
191e713
1d1b86e
d85308b
439787d
deef342
a4d3b60
b9b05ea
815d8bd
1640bef
e653724
16caa74
52c411a
3b8ca91
d3480f7
ef6d234
12c428d
48c6573
6529be0
414bc7c
55175fa
3244dd3
34ed159
a55ecfb
9bbb12b
c17971f
326ef91
6a0844b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,11 @@ | |
to_chat(user, "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>") | ||
user.Dizzy(120) | ||
|
||
if(HULK in user.mutations) | ||
to_chat(user, "<span class='danger'>\"you can't seem to hold the blade properly!.\"</span>") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ends in both an exclamation, and a full stop... as well as doesn't start with a capitalised letter. |
||
user.unEquip(src, 1) | ||
|
||
|
||
/obj/item/weapon/melee/cultblade/dagger | ||
name = "sacrificial dagger" | ||
desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." | ||
|
@@ -321,6 +326,7 @@ | |
if(uses <= 0) | ||
icon_state ="shifter_drained" | ||
playsound(mobloc, "sparks", 50, 1) | ||
C.apply_damage(6, "BRUTE") | ||
new /obj/effect/overlay/temp/cult/phase/out(mobloc) | ||
|
||
var/atom/movable/pulled = handle_teleport_grab(destination, C) | ||
|
@@ -334,3 +340,60 @@ | |
|
||
else | ||
to_chat(C, "<span class='danger'>The veil cannot be torn here!</span>") | ||
|
||
|
||
/obj/item/weapon/melee/cultblade/ghost | ||
name = "eldritch sword" | ||
force = 15 | ||
flags = NODROP | ||
|
||
/obj/item/weapon/melee/cultblade/ghost/dropped(mob/living/carbon/human/user) | ||
..() | ||
qdel(src) | ||
|
||
/obj/item/clothing/head/culthood/alt/ghost | ||
flags = NODROP | ||
|
||
/obj/item/clothing/head/culthood/alt/ghost/dropped(mob/living/carbon/human/user) | ||
..() | ||
qdel(src) | ||
|
||
/obj/item/clothing/suit/cultrobes/alt/ghost | ||
flags = NODROP | ||
|
||
/obj/item/clothing/suit/cultrobes/alt/ghost/dropped(mob/living/carbon/human/user) | ||
..() | ||
qdel(src) | ||
|
||
/obj/item/clothing/shoes/cult/ghost | ||
flags = NODROP | ||
|
||
/obj/item/clothing/shoes/cult/ghost/dropped(mob/living/carbon/human/user) | ||
..() | ||
qdel(src) | ||
|
||
//CULT | ||
|
||
/obj/item/clothing/suit/space/eva/plasmaman/cultist | ||
name = "plasmaman cultist armor" | ||
icon_state = "plasmaman_cult" | ||
item_state = "plasmaman_cult" | ||
desc = "A bulky suit of armour, menacing with red energy. It looks like it would fit a plasmaman." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sadly it should be |
||
slowdown = 1 | ||
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) | ||
|
||
/obj/item/clothing/head/helmet/space/eva/plasmaman/cultist | ||
name = "plasmaman cultist helmet" | ||
icon_state = "plasmamanCult_helmet0" | ||
base_state = "plasmamanCult_helmet" | ||
desc = "A containment suit designed by the followers of Nar-Sie. It glows menacingly with unearthly flames." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Says suit, on a helmet? |
||
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) | ||
|
||
/datum/outfit/ghost_cultist | ||
name = "Cultist Ghost" | ||
|
||
uniform = /obj/item/clothing/under/color/black | ||
suit = /obj/item/clothing/suit/cultrobes/alt/ghost | ||
shoes = /obj/item/clothing/shoes/cult/ghost | ||
head = /obj/item/clothing/head/culthood/alt/ghost | ||
r_hand = /obj/item/weapon/melee/cultblade/ghost |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,9 +84,10 @@ | |
explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for his blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." | ||
|
||
for(var/datum/mind/cult_mind in cult) | ||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes have completed your task, but this place requires yet more preparation!</span>") | ||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
if(cult_mind) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inside a typed loop, shouldn't be |
||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes have completed your task, but this place requires yet more preparation!</span>") | ||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't we be using <span>'s rather than <b>? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thats a constant with some objectives so its more then here. |
||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
|
||
message_admins("New Cult Objective: [new_objective]") | ||
log_admin("New Cult Objective: [new_objective]") | ||
|
@@ -98,9 +99,10 @@ | |
objectives +="survive" | ||
explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station." | ||
for(var/datum/mind/cult_mind in cult) | ||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes suddenly feel the urge to do your best, but survive!</span>") | ||
to_chat(cult_mind.current, "<B>Objective Survive</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective Survive</B>: [explanation]<BR>" | ||
if(cult_mind) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inside a typed loop, shouldn't be |
||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes suddenly feel the urge to do your best, but survive!</span>") | ||
to_chat(cult_mind.current, "<B>Objective Survive</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective Survive</B>: [explanation]<BR>" | ||
|
||
|
||
/datum/game_mode/cult/proc/second_phase() | ||
|
@@ -115,9 +117,10 @@ | |
explanation = "Bring the Slaughter via the rune 'Bring forth the slaughter'." | ||
|
||
for(var/datum/mind/cult_mind in cult) | ||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes have succeeded in preparing the station for the ultimate ritual!</span>") | ||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
if(cult_mind) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is inside a typed loop, it shouldn't ever be |
||
to_chat(cult_mind.current, "<span class='cult'>You and your acolytes have succeeded in preparing the station for the ultimate ritual!</span>") | ||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
|
||
/datum/game_mode/cult/proc/third_phase() | ||
current_objective++ | ||
|
@@ -132,15 +135,16 @@ | |
|
||
switch(last_objective) | ||
if("harvest") | ||
explanation = "[ticker.mode.cultdat.entity_title1] hungers for his first meal of this never-ending day. Offer him [harvest_target] humans in sacrifice." | ||
explanation = "[ticker.mode.cultdat.entity_title1] hungers for thier first meal of this never-ending day. Offer them [harvest_target] humans in sacrifice." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. their |
||
if("hijack") | ||
explanation = "[ticker.mode.cultdat.entity_name] wishes for his troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." | ||
explanation = "[ticker.mode.cultdat.entity_name] wishes for thier troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. their, not thier |
||
if("massacre") | ||
explanation = "[ticker.mode.cultdat.entity_name] wants to watch you as you massacre the remaining humans on the station (until less than [massacre_target] humans are left alive)." | ||
|
||
for(var/datum/mind/cult_mind in cult) | ||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
if(cult_mind) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. inside a typed loop, shouldn't be |
||
to_chat(cult_mind.current, "<B>Objective #[current_objective]</B>: [explanation]") | ||
cult_mind.memory += "<B>Objective #[current_objective]</B>: [explanation]<BR>" | ||
|
||
message_admins("Last Cult Objective: [last_objective]") | ||
log_admin("Last Cult Objective: [last_objective]") | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,6 +54,9 @@ | |
to_chat(user, "<span class='notice'>\The [src] is [anchored ? "":"not "]secured to the floor.</span>") | ||
|
||
/obj/structure/cult/functional/attackby(obj/I, mob/user, params) | ||
if(HULK in user.mutations) | ||
to_chat(user, "<span class='danger'>\"you can seem to work the structure right with your bulky hands!.\"</span>") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no capitalisation for the beginning word, and both a fullstop and an exclamation mark. The english is a bit dodge. Also, it seems to say you CAN use it, but the immediate return shows you can't? Going to assume the can is an error also. Suggest:
or
Something like that? |
||
return | ||
if(istype(I, /obj/item/weapon/tome) && iscultist(user)) | ||
anchored = !anchored | ||
to_chat(user, "<span class='notice'>You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.</span>") | ||
|
@@ -161,7 +164,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( | |
death_message = "<span class='warning'>The pylon's crystal vibrates and glows fiercely before violently shattering!</span>" | ||
death_sound = 'sound/effects/pylon_shatter.ogg' | ||
|
||
var/heal_delay = 25 | ||
var/heal_delay = 50 | ||
var/last_heal = 0 | ||
var/corrupt_delay = 50 | ||
var/last_corrupt = 0 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are these deffo capitalised in the file? I've come across several sprite issues lately due to caps inconsistency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i will double check in a little while.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
they are.