Skip to content

Commit

Permalink
removing cult weapons
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Apr 14, 2024
1 parent e4d9d66 commit e4671a6
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 545 deletions.
3 changes: 1 addition & 2 deletions code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ SUBSYSTEM_DEF(traumas)

"the supernatural" = typecacheof(list(
/obj/structure/destructible/cult, /obj/item/tome,
/obj/item/melee/cultblade, /obj/item/cult_bastard,
/obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
Expand Down Expand Up @@ -158,7 +157,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star,
/obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja,
/obj/item/melee/sword/vibro, /obj/item/energy_katana, /obj/item/toy/katana,
/obj/item/melee/sword/vibro, /obj/item/melee/sword/energy_katana, /obj/item/toy/katana,
/obj/item/melee/sword/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
)

Expand Down
38 changes: 0 additions & 38 deletions code/datums/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -473,44 +473,6 @@
name = "Use [target.name]"
button.name = name

/datum/action/item_action/cult_dagger
name = "Draw Blood Rune"
desc = "Use the ritual dagger to create a powerful blood rune"
icon_icon = 'icons/mob/actions/actions_cult.dmi'
button_icon_state = "draw"
buttontooltipstyle = "cult"
background_icon_state = "bg_demon"

/datum/action/item_action/cult_dagger/Grant(mob/M)
if(iscultist(M))
..()
button.screen_loc = "6:157,4:-2"
button.moved = "6:157,4:-2"
else
Remove(owner)


/datum/action/item_action/cult_dagger/Trigger()
for(var/obj/item/H in owner.held_items) //In case we were already holding another dagger
if(istype(H, /obj/item/melee/cultblade/dagger))
H.attack_self(owner)
return
var/obj/item/I = target
if(owner.can_equip(I, ITEM_SLOT_HANDS))
owner.temporarilyRemoveItemFromInventory(I)
owner.put_in_hands(I)
I.attack_self(owner)
return
if(!isliving(owner))
to_chat(owner, "<span class='warning'>You lack the necessary living force for this action.</span>")
return
var/mob/living/living_owner = owner
if (living_owner.usable_hands <= 0)
to_chat(living_owner, "<span class='warning'>You dont have any usable hands!</span>")
else
to_chat(living_owner, "<span class='warning'>Your hands are full!</span>")


///MGS BOX!
/datum/action/item_action/agent_box
name = "Deploy Box"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/storage/concrete/pockets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
. = ..()
var/static/list/exception_cache = typecacheof(list(
/obj/item/toy/katana, /obj/item/melee/sword/katana,
/obj/item/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
/obj/item/melee/sword/energy_katana, /obj/item/gun/ballistic/automatic/smg/firestorm/pan
))
exception_hold = exception_cache

Expand Down
17 changes: 0 additions & 17 deletions code/game/objects/items/storage/book.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,23 +188,6 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
B.name = name
B.icon_state = icon_state
B.item_state = item_state
if(istype(A, /obj/item/cult_bastard) && !iscultist(user))
var/obj/item/cult_bastard/sword = A
to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
if(do_after(user, 40, target = sword))
playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
for(var/obj/item/soulstone/SS in sword.contents)
SS.usability = TRUE
for(var/mob/living/simple_animal/shade/EX in SS)
SSticker.mode.remove_cultist(EX.mind, 1, 0)
EX.icon_state = "ghost1"
EX.name = "Purified [EX.name]"
SS.release_shades(user)
qdel(SS)
new /obj/item/melee/sword/claymore(get_turf(sword))
user.visible_message("<span class='notice'>[user] purifies [sword]!</span>")
qdel(sword)
else if(istype(A, /obj/item/soulstone) && !iscultist(user))
var/obj/item/soulstone/SS = A
if(SS.purified)
Expand Down
5 changes: 0 additions & 5 deletions code/game/objects/structures/girders.dm
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,6 @@

/obj/structure/girder/cult/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/melee/cultblade/dagger) && iscultist(user)) //Cultists can demolish cult girders instantly with their tomes
user.visible_message("<span class='warning'>[user] strikes [src] with [W]!</span>", "<span class='notice'>You demolish [src].</span>")
new /obj/item/stack/sheet/runed_metal(drop_location(), 1)
qdel(src)

else if(W.tool_behaviour == TOOL_WELDER)
if(!W.tool_start_check(user, amount=0))
return
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/structures/icemoon/cave_entrance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -841,9 +841,6 @@ GLOBAL_LIST_INIT(ore_probability, list(
if(prob(35))
new /obj/item/sharpener/cult(loc)
new /mob/living/simple_animal/hostile/construct/artificer/hostile(loc)
if(prob(15))
new /obj/item/cult_bastard(loc)
new /mob/living/simple_animal/hostile/construct/juggernaut/hostile(loc)
if(prob(35))
new /obj/item/cult_shift(loc)
new /mob/living/simple_animal/hostile/construct/proteon/hostile(loc)
Expand Down
29 changes: 0 additions & 29 deletions code/modules/antagonists/cult/blood_magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,34 +182,6 @@
magic_path = "/obj/item/melee/blood_magic/construction"
health_cost = 12

/datum/action/innate/cult/blood_spell/equipment
name = "Summon Equipment"
desc = "Allows you to summon a ritual dagger, or empowers your hand to summon combat gear onto a cultist you touch, including cult armor, a cult bola, and a cult sword."
button_icon_state = "equip"
magic_path = "/obj/item/melee/blood_magic/armor"

/datum/action/innate/cult/blood_spell/equipment/Activate()
var/choice = alert(owner,"Choose your equipment type",,"Combat Equipment","Ritual Dagger","Cancel")
if(choice == "Ritual Dagger")
var/turf/T = get_turf(owner)
owner.visible_message("<span class='warning'>[owner]'s hand glows red for a moment.</span>", \
"<span class='cultitalic'>Red light begins to shimmer and take form within your hand!</span>")
var/obj/O = new /obj/item/melee/cultblade/dagger(T)
if(owner.put_in_hands(O))
to_chat(owner, "<span class='warning'>A ritual dagger appears in your hand!</span>")
else
owner.visible_message(
"<span class='warning'>A ritual dagger appears at [owner]'s feet!</span>", \
"<span class='cultitalic'>A ritual dagger materializes at your feet.</span>")
SEND_SOUND(owner, sound('sound/effects/magic.ogg',0,1,25))
charges--
desc = base_desc
desc += "<br><b><u>Has [charges] use\s remaining</u></b>."
if(charges<=0)
qdel(src)
else if(choice == "Combat Equipment")
..()

/datum/action/innate/cult/blood_spell/horror
name = "Hallucinations"
desc = "Gives hallucinations to a target at range. A silent and invisible spell."
Expand Down Expand Up @@ -695,7 +667,6 @@
C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK)
if(C == user)
qdel(src) //Clears the hands
C.put_in_hands(new /obj/item/melee/cultblade(user))
C.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user))
..()

Expand Down
3 changes: 1 addition & 2 deletions code/modules/antagonists/cult/cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
var/mob/living/carbon/H = owner.current
if(!istype(H))
return
. += cult_give_item(/obj/item/melee/cultblade/dagger, H)
if(metal)
. += cult_give_item(/obj/item/stack/sheet/runed_metal/ten, H)
to_chat(owner, "These will help you jumpstart a cult of your own in this sector. Use them well, and remember - you are not the only one.</span>")
Expand Down Expand Up @@ -177,7 +176,7 @@
/datum/antagonist/cult/proc/admin_take_all(mob/admin)
var/mob/living/current = owner.current
for(var/o in current.GetAllContents())
if(istype(o, /obj/item/melee/cultblade/dagger) || istype(o, /obj/item/stack/sheet/runed_metal))
if(istype(o, istype(o, /obj/item/stack/sheet/runed_metal))
qdel(o)

/datum/antagonist/cult/master
Expand Down
Loading

0 comments on commit e4671a6

Please sign in to comment.