Skip to content

Commit

Permalink
requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BeagleGaming1 committed Dec 12, 2024
1 parent a08e824 commit a33ebc4
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 115 deletions.
114 changes: 0 additions & 114 deletions code/modules/hallucinations/effects/chaser_hallucinations.dm

This file was deleted.

85 changes: 85 additions & 0 deletions code/modules/hallucinations/effects/major.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@

new /obj/effect/hallucination/chaser/attacker/terror_spider(get_turf(vent), target)

/obj/effect/hallucination/chaser/attacker/terror_spider
hallucination_icon = 'icons/mob/terrorspider.dmi'
hallucination_icon_state = "terror_green"
duration = 30 SECONDS
damage = 25

/obj/effect/hallucination/chaser/attacker/terror_spider/Initialize(mapload, mob/living/carbon/target)
. = ..()
name = "Green Terror spider ([rand(100, 999)])"

/obj/effect/hallucination/chaser/attacker/terror_spider/attack_effects()
do_attack_animation(target, ATTACK_EFFECT_BITE)
target.playsound_local(get_turf(src), 'sound/weapons/bite.ogg', 50, TRUE)
to_chat(target, "<span class='userdanger'>[name] bites you!</span>")

/obj/effect/hallucination/chaser/attacker/terror_spider/on_knockdown()
target.visible_message("<span class='warning'>[target] recoils as if hit by something, before suddenly collapsing!</span>",
"<span class='userdanger'>[name] bites you!</span>")

/**
* # Hallucination - Spider Web
*
Expand Down Expand Up @@ -146,6 +165,30 @@
scientist.dir = get_dir(T, target)
add_icon(scientist)

/obj/effect/hallucination/chaser/attacker/abductor
hallucination_icon = 'icons/mob/simple_human.dmi'
hallucination_icon_state = "abductor_agent"
duration = 45 SECONDS
damage = 100
/// The hallucination that spawned us.
var/obj/effect/hallucination/abduction/owning_hallucination = null

/obj/effect/hallucination/chaser/attacker/abductor/Initialize(mapload, mob/living/carbon/target)
. = ..()
name = "Unknown"

/obj/effect/hallucination/chaser/attacker/abductor/attack_effects()
do_attack_animation(target)
target.playsound_local(get_turf(src), 'sound/weapons/egloves.ogg', 50, TRUE)

/obj/effect/hallucination/chaser/attacker/abductor/on_knockdown()
target.visible_message("<span class='warning'>[target] recoils as if hit by something, before suddenly collapsing!</span>",
"<span class='userdanger'>[name] has stunned you with the advanced baton!</span>")
if(!QDELETED(owning_hallucination))
owning_hallucination.spawn_scientist()
else
qdel(src)

/**
* # Hallucination - Loose Energy Ball
*
Expand Down Expand Up @@ -245,6 +288,48 @@
var/turf/T = pick(locs)
fake_attacker = new(T, target)

/obj/effect/hallucination/chaser/attacker/assaulter
duration = 30 SECONDS
damage = 40
/// The attack verb to display.
var/attack_verb = "punches"
/// The attack sound to play. Can be a file or text (passed to [/proc/get_sfx]).
var/attack_sound = "punch"

/obj/effect/hallucination/chaser/attacker/assaulter/Initialize(mapload, mob/living/carbon/target)
var/new_name
// 80% chance to use a simple human sprite
if(prob(80))
new_name = "Unknown"
hallucination_icon = 'icons/mob/simple_human.dmi'
hallucination_icon_state = pick("arctic_skeleton", "templar", "skeleton", "sovietmelee", "piratemelee", "plasma_miner_tool", "cat_butcher", "syndicate_space_sword", "syndicate_stormtrooper_sword", "zombie", "scary_clown")

// Adjust the attack verb and sound depending on the "mob"
switch(hallucination_icon_state)
if("arctic_skeleton", "templar", "sovietmelee", "plasma_miner_tool")
attack_verb = "slashed"
attack_sound = 'sound/weapons/bladeslice.ogg'
if("cat_butcher")
attack_verb = "sawed"
attack_sound = 'sound/weapons/circsawhit.ogg'
if("piratemelee", "syndicate_space_sword", "syndicate_stormtrooper_sword")
attack_verb = "slashed"
attack_sound = 'sound/weapons/blade1.ogg'

// If nothing else we'll stay a monke
. = ..()
name = new_name || name

/obj/effect/hallucination/chaser/attacker/assaulter/attack_effects()
do_attack_animation(target)
target.playsound_local(get_turf(src), istext(attack_sound) ? get_sfx(attack_sound) : attack_sound, 25, TRUE)
to_chat(target, "<span class='userdanger'>[name] has [attack_verb] [target]!</span>")

/obj/effect/hallucination/chaser/attacker/assaulter/on_knockdown()
target.visible_message("<span class='warning'>[target] recoils as if hit by something, before suddenly collapsing!</span>",
"<span class='userdanger'>[name] has [attack_verb] [target]!</span>")
QDEL_IN(src, 3 SECONDS)

/**
* # Hallucination - Xeno Pounce
*
Expand Down
21 changes: 21 additions & 0 deletions code/modules/hallucinations/effects/moderate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -584,3 +584,24 @@
target.playsound_local(grenade_turf, 'sound/effects/phasein.ogg', 60, TRUE)
target.flash_eyes(visual = TRUE)
new /obj/effect/hallucination/chaser/attacker/space_carp(grenade_turf, target)

/**
* # Hallucination - Space Carp
*/
/obj/effect/hallucination/chaser/attacker/space_carp
hallucination_icon = 'icons/mob/carp.dmi'
hallucination_icon_state = "base"
duration = 30 SECONDS
damage = 25

/obj/effect/hallucination/chaser/attacker/space_carp/Initialize(mapload, mob/living/carbon/hallucination_target)
. = ..()
name = "space carp"

/obj/effect/hallucination/chaser/attacker/space_carp/attack_effects()
do_attack_animation(target, ATTACK_EFFECT_BITE)
target.playsound_local(get_turf(src), 'sound/weapons/bite.ogg', 50, TRUE)
to_chat(target, "<span class='userdanger'>[name] bites you!</span>")

/obj/effect/hallucination/chaser/attacker/space_carp/on_knockdown()
target.visible_message("<span class='warning'>[target] recoils as if hit by something, before suddenly collapsing!</span>", "<span class='userdanger'>[name] bites you!</span>")
1 change: 0 additions & 1 deletion paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,6 @@
#include "code\modules\games\unum.dm"
#include "code\modules\hallucinations\hallucination_manager.dm"
#include "code\modules\hallucinations\hallucinations.dm"
#include "code\modules\hallucinations\effects\chaser_hallucinations.dm"
#include "code\modules\hallucinations\effects\common.dm"
#include "code\modules\hallucinations\effects\major.dm"
#include "code\modules\hallucinations\effects\minor.dm"
Expand Down

0 comments on commit a33ebc4

Please sign in to comment.