-
-
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 2 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 |
---|---|---|
|
@@ -334,3 +334,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 |
---|---|---|
|
@@ -118,6 +118,9 @@ structure_check() searches for nearby cultist structures required for the invoca | |
//This proc determines if the rune can be invoked at the time. If there are multiple required cultists, it will find all nearby cultists. | ||
var/list/invokers = list() //people eligible to invoke the rune | ||
var/list/chanters = list() //people who will actually chant the rune when passed to invoke() | ||
if(invisibility == 0) | ||
return | ||
|
||
if(user) | ||
chanters |= user | ||
invokers |= user | ||
|
@@ -316,6 +319,7 @@ var/list/teleport_runes = list() | |
to_chat(user, "<span class='cult'>You[moveuserlater ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].</span>") | ||
if(moveuserlater) | ||
user.forceMove(get_turf(actual_selected_rune)) | ||
user.apply_damage(6, BRUTE) | ||
else | ||
fail_invoke() | ||
|
||
|
@@ -767,7 +771,7 @@ var/list/teleport_runes = list() | |
affecting = null //In case it's assigned to a number or something | ||
rune_in_use = 0 | ||
return | ||
affecting.apply_damage(1, BRUTE) | ||
affecting.apply_damage(prob(3), BRUTE) | ||
if(!(user in T.contents)) | ||
user.visible_message("<span class='warning'>A spectral tendril wraps around [user] and pulls them back to the rune!</span>") | ||
Beam(user,icon_state="drainbeam",icon='icons/effects/effects.dmi',time=2) | ||
|
@@ -818,7 +822,7 @@ var/list/teleport_runes = list() | |
"<span class='cultitalic'>You channel your life energy into [src], [density ? "preventing" : "allowing"] passage above it.</span>") | ||
if(iscarbon(user)) | ||
var/mob/living/carbon/C = user | ||
C.apply_damage(2, BRUTE, pick("l_arm", "r_arm")) | ||
C.apply_damage(4, BRUTE, pick("l_arm", "r_arm")) | ||
|
||
|
||
//Rite of Joined Souls: Summons a single cultist. | ||
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. Maybe stop this working if the cultist is cuffed? We've had issues with teleporting cultists that we have to lethal to subdue. It sucks when a cultist is cuffed, chaired in the brig - and they just get teleported out. |
||
|
@@ -889,7 +893,7 @@ var/list/teleport_runes = list() | |
C.Stun(7) | ||
for(var/M in invokers) | ||
var/mob/living/L = M | ||
L.apply_damage(15, BRUTE, pick("l_arm", "r_arm")) | ||
L.apply_damage(17, BRUTE, pick("l_arm", "r_arm")) | ||
to_chat(L,"<span class='cultitalic'>[src] saps your strength!</span>") | ||
qdel(src) | ||
explosion(T, -1, 0, 1, 5) | ||
|
@@ -940,6 +944,8 @@ var/list/teleport_runes = list() | |
construct_invoke = 0 | ||
color = rgb(200, 0, 0) | ||
var/list/summoned_guys = list() | ||
var/ghost_limit = 5 | ||
var/ghosts = 0 | ||
|
||
/obj/effect/rune/manifest/New(loc) | ||
..() | ||
|
@@ -948,6 +954,11 @@ var/list/teleport_runes = list() | |
notify_ghosts("Manifest rune created in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src) | ||
|
||
/obj/effect/rune/manifest/can_invoke(mob/living/user) | ||
if(ghosts >= ghost_limit) | ||
to_chat(user, "<span class='cultitalic'>You are sustaining too many ghosts to summon more!</span>") | ||
fail_invoke() | ||
log_game("Manifest rune failed - too many summoned ghosts") | ||
return list() | ||
if(!(user in get_turf(src))) | ||
to_chat(user,"<span class='cultitalic'>You must be standing on [src]!</span>") | ||
fail_invoke() | ||
|
@@ -974,8 +985,12 @@ var/list/teleport_runes = list() | |
var/mob/living/carbon/human/new_human = new(get_turf(src)) | ||
new_human.real_name = ghost_to_spawn.real_name | ||
new_human.alpha = 150 //Makes them translucent | ||
new_human.equipOutfit(/datum/outfit/ghost_cultist) //give them armor | ||
new_human.color = "grey" //heh..cult greytide...litterly... | ||
..() | ||
|
||
playsound(src, 'sound/misc/exit_blood.ogg', 50, 1) | ||
user.apply_damage(10, BRUTE) | ||
visible_message("<span class='warning'>A cloud of red mist forms above [src], and from within steps... a man.</span>") | ||
to_chat(user, "<span class='cultitalic'>Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...</span>") | ||
var/obj/machinery/shield/N = new(get_turf(src)) | ||
|
@@ -987,6 +1002,7 @@ var/list/teleport_runes = list() | |
new_human.key = ghost_to_spawn.key | ||
ticker.mode.add_cultist(new_human.mind, 0) | ||
summoned_guys |= new_human | ||
ghosts++ | ||
to_chat(new_human, "<span class='cultitalic'><b>You are a servant of [ticker.mode.cultdat.entity_title3]. You have been made semi-corporeal by the cult of [ticker.mode.cultdat.entity_name], and you are to serve them at all costs.</b></span>") | ||
|
||
while(user in get_turf(src)) | ||
|
@@ -1002,6 +1018,7 @@ var/list/teleport_runes = list() | |
for(var/obj/I in new_human) | ||
new_human.unEquip(I) | ||
summoned_guys -= new_human | ||
ghosts -- | ||
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. if you do |
||
new_human.dust() | ||
|
||
/obj/effect/rune/manifest/Destroy() | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -277,8 +277,12 @@ | |
var/mob/living/carbon/human/H = user | ||
user.visible_message("<span class='warning'>Otherworldly armor suddenly appears on [user]!</span>", \ | ||
"<span class='cultitalic'>You speak the words of the talisman, arming yourself!</span>") | ||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit) | ||
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) | ||
if(H.get_species() == "Plasmaman") | ||
H.equip_to_slot(new /obj/item/clothing/suit/space/eva/plasmaman/cultist(H), slot_wear_suit) | ||
H.equip_to_slot(new /obj/item/clothing/head/helmet/space/eva/plasmaman/cultist(H), slot_head) | ||
else | ||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit) | ||
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) | ||
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. Why would you disallow Plasmamen from using the cultbackpack? |
||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) | ||
H.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) | ||
H.put_in_hands(new /obj/item/weapon/restraints/legcuffs/bola/cult(user)) | ||
|
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.