couple more projectiles, fixes bugs

This commit is contained in:
XDTM
2017-07-19 21:34:18 +02:00
parent 264bd8c780
commit 6425fbbec0
2 changed files with 51 additions and 16 deletions
+29 -3
View File
@@ -390,8 +390,8 @@
/obj/item/projectile/hallucination
name = "bullet"
icon = 'icons/obj/projectiles.dmi'
icon_state = "bullet"
icon = null
icon_state = null
hitsound = ""
suppressed = TRUE
ricochets_max = 0
@@ -544,6 +544,7 @@
/obj/item/projectile/hallucination/taser
name = "electrode"
damage_type = BURN
hal_icon_state = "spark"
color = "#FFFF00"
hal_fire_sound = 'sound/weapons/taser.ogg'
@@ -551,7 +552,6 @@
hal_hitsound_wall = null
hal_impact_effect = null
hal_impact_effect_wall = null
range = 7
/obj/item/projectile/hallucination/taser/hal_apply_effect()
hal_target.Knockdown(100)
@@ -590,3 +590,29 @@
hal_target.Knockdown(100)
hal_target.stuttering += 5
hal_target.adjustStaminaLoss(8)
/obj/item/projectile/hallucination/change
name = "bolt of change"
damage_type = BURN
hal_icon_state = "ice_1"
hal_fire_sound = 'sound/magic/staff_change.ogg'
hal_hitsound = null
hal_hitsound_wall = null
hal_impact_effect = null
hal_impact_effect_wall = null
/obj/item/projectile/hallucination/change/hal_apply_effect()
new /datum/hallucination/self_delusion(hal_target, TRUE, wabbajack = FALSE)
/obj/item/projectile/hallucination/death
name = "bolt of death"
damage_type = BURN
hal_icon_state = "pulse1_bl"
hal_fire_sound = 'sound/magic/wandodeath.ogg'
hal_hitsound = null
hal_hitsound_wall = null
hal_impact_effect = null
hal_impact_effect_wall = null
/obj/item/projectile/hallucination/death/hal_apply_effect()
new /datum/hallucination/death(hal_target, TRUE)