Skip to content
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

Removes the voodoo/wicker doll item #18500

Merged
merged 2 commits into from
Jul 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions code/datums/uplink_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))

//Chaplain

/datum/uplink_item/jobspecific/voodoo
name = "Voodoo Doll"
desc = "A doll created by Syndicate Witch Doctors. Ingredients: Something of the Thread, Something of the Head, Something of the Body, Something of the Dead, Secret Voodoo herbs, and Monosodium glutamate."
reference = "VD"
item = /obj/item/voodoo
cost = 13
job = list("Chaplain")

/datum/uplink_item/jobspecific/missionary_kit
name = "Missionary Starter Kit"
desc = "A box containing a missionary staff, missionary robes, and bible. The robes and staff can be linked to allow you to convert victims at range for a short time to do your bidding. The bible is for bible stuff."
Expand Down
126 changes: 0 additions & 126 deletions code/game/gamemodes/wizard/artefact.dm
Original file line number Diff line number Diff line change
Expand Up @@ -789,132 +789,6 @@ GLOBAL_LIST_EMPTY(multiverse)
heresy = 1
unlimited = 1

/////////////////////////////////////////Voodoo///////////////////


/obj/item/voodoo
name = "wicker doll"
desc = "Something creepy about it."
icon = 'icons/obj/wizard.dmi'
icon_state = "voodoo"
item_state = "electronic"
var/mob/living/carbon/human/target = null
var/list/mob/living/carbon/human/possible = list()
var/obj/item/link = null
var/cooldown_time = 30 //3s
var/cooldown = 0
max_integrity = 10
resistance_flags = FLAMMABLE

/obj/item/voodoo/attackby(obj/item/I as obj, mob/user as mob, params)
if(target && cooldown < world.time)
if(is_hot(I))
to_chat(target, "<span class='userdanger'>You suddenly feel very hot</span>")
target.bodytemperature += 50
GiveHint(target)
else if(is_pointed(I))
to_chat(target, "<span class='userdanger'>You feel a stabbing pain in [parse_zone(user.zone_selected)]!</span>")
target.Weaken(4 SECONDS)
GiveHint(target)
else if(istype(I,/obj/item/bikehorn))
to_chat(target, "<span class='userdanger'>HONK</span>")
SEND_SOUND(target, sound('sound/items/airhorn.ogg'))
target.AdjustEarDamage(0, 3)
GiveHint(target)
cooldown = world.time +cooldown_time
return

if(!link)
if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
user.drop_item()
I.loc = src
link = I
to_chat(user, "You attach [I] to the doll.")
update_targets()
return
return ..()

/obj/item/voodoo/check_eye(mob/user)
if(loc != user)
user.reset_perspective(null)
user.unset_machine()

/obj/item/voodoo/attack_self(mob/user as mob)
if(!target && possible.len)
target = input(user, "Select your victim!", "Voodoo") as null|anything in possible
return

if(user.zone_selected == "chest")
if(link)
target = null
link.loc = get_turf(src)
to_chat(user, "<span class='notice'>You remove [link] from the doll.</span>")
link = null
update_targets()
return

if(target && cooldown < world.time)
switch(user.zone_selected)
if("mouth")
var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text)
target.say(wgw)
log_game("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.")
log_say("Wicker doll say to [target][target.key]: [wgw]", user)
log_admin("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.")
user.create_log(SAY_LOG, "forced [target] to say [wgw] through [src].", target)
target.create_log(SAY_LOG, "was forced to say [wgw] through [src] by [user].", user)
if("eyes")
user.set_machine(src)
user.reset_perspective(target)
spawn(100)
user.reset_perspective(null)
user.unset_machine()
if("r_leg","l_leg")
to_chat(user, "<span class='notice'>You move the doll's legs around.</span>")
var/turf/T = get_step(target,pick(GLOB.cardinal))
target.Move(T)
if("r_arm","l_arm")
//use active hand on random nearby mob
var/list/nearby_mobs = list()
for(var/mob/living/L in range(1,target))
if(L!=target)
nearby_mobs |= L
if(nearby_mobs.len)
var/mob/living/T = pick(nearby_mobs)
log_game("[user][user.key] made [target][target.key] click on [T] with a voodoo doll.")
target.ClickOn(T)
GiveHint(target)
if("head")
to_chat(user, "<span class='notice'>You smack the doll's head with your hand.</span>")
target.Dizzy(20 SECONDS)
to_chat(target, "<span class='warning'>You suddenly feel as if your head was hit with a hammer!</span>")
GiveHint(target,user)
cooldown = world.time + cooldown_time

/obj/item/voodoo/proc/update_targets()
possible = list()
if(!link)
return
for(var/thing in GLOB.human_list)
var/mob/living/carbon/human/H = thing
if(H.stat != DEAD && (md5(H.dna.uni_identity) in link.fingerprints))
possible |= H

/obj/item/voodoo/proc/GiveHint(mob/victim,force=0)
if(prob(50) || force)
var/way = dir2text(get_dir(victim,get_turf(src)))
to_chat(victim, "<span class='notice'>You feel a dark presence from [way]</span>")
if(prob(20) || force)
var/area/A = get_area(src)
to_chat(victim, "<span class='notice'>You feel a dark presence from [A.name]</span>")

/obj/item/voodoo/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(target)
target.adjust_fire_stacks(20)
target.IgniteMob()
GiveHint(target,1)
return ..()

/obj/item/organ/internal/heart/cursed/wizard
pump_delay = 60
heal_brute = 25
Expand Down
4 changes: 1 addition & 3 deletions code/game/gamemodes/wizard/rightandwrong.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ GLOBAL_LIST_INIT(summoned_magic, list(
/obj/item/gun/magic/staff/healing,
/obj/item/gun/magic/staff/door,
/obj/item/scrying,
/obj/item/voodoo,
/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword))
Expand All @@ -90,8 +89,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list(
/obj/item/necromantic_stone,
/obj/item/scrying,
/obj/item/spellbook,
/obj/item/storage/belt/wands/full,
/obj/item/voodoo))
/obj/item/storage/belt/wands/full))

// If true, it's the probability of triggering "survivor" antag.
GLOBAL_VAR_INIT(summon_guns_triggered, FALSE)
Expand Down
12 changes: 5 additions & 7 deletions code/modules/mining/lavaland/necropolis_chests.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
desc = "It's watching you suspiciously."

/obj/structure/closet/crate/necropolis/tendril/populate_contents()
var/loot = rand(1, 25)
var/loot = rand(1, 24)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
Expand Down Expand Up @@ -61,17 +61,15 @@
if(19)
new /obj/item/gun/magic/hook(src)
if(20)
new /obj/item/voodoo(src)
if(21)
new /obj/item/grenade/clusterbuster/inferno(src)
if(22)
if(21)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor(src)
if(23)
if(22)
new /obj/item/spellbook/oneuse/summonitem(src)
if(24)
if(23)
new /obj/item/book_of_babel(src)
if(25)
if(24)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)

Expand Down