From 3260e568e5890c3d77cb45c707818f2ccce04779 Mon Sep 17 00:00:00 2001 From: Ro2tCrab Date: Fri, 13 Sep 2024 15:16:12 +0500 Subject: [PATCH] help_need --- .../modules/mob/living/simple_animal/hostile/carp.dm | 5 +++-- code/modules/projectiles/ammunition/special.dm | 6 ++++++ code/modules/projectiles/guns/magic/wand.dm | 12 ++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index f73014eaad90..d3737a65669c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -170,6 +170,7 @@ ranged = TRUE retreat_distance = 2 minimum_distance = 5 + faction = "wizard" /mob/living/simple_animal/hostile/carp/magic/atom_init() ..() @@ -184,9 +185,9 @@ /mob/living/simple_animal/hostile/carp/magic/carp_randomify() return 0 -/mob/living/simple_animal/hostile/carp/magic/chaos +/mob/living/simple_animal/hostile/carp/magic/chaos //Only for shitspawn.. for now. -Ro2tCrab name = "chaos carp" - desc = "Свирепое и клыкастое существо, напоминающее рыбу. На 50% карп, 100% хаос." + desc = "Свирепое и клыкастое существо, напоминающее рыбу. На 50% карп, на 100% хаос." icon_state = "chaoscarp" icon_living = "chaoscarp" icon_dead = "chaoscarp_dead" diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm index d97fe8e728b9..8fd44f805d76 100644 --- a/code/modules/projectiles/ammunition/special.dm +++ b/code/modules/projectiles/ammunition/special.dm @@ -18,12 +18,18 @@ /obj/item/ammo_casing/magic/wand/forcewall projectile_type = /obj/item/projectile/magic/wand/forcewall +/obj/item/ammo_casing/magic/wand/heal + projectile_type = /obj/item/projectile/magic/wand/heal + /obj/item/ammo_casing/magic/wand/broken_mirror projectile_type = /obj/item/projectile/magic/wand/broken_mirror /obj/item/ammo_casing/magic/wand/magicarp projectile_type = /obj/item/projectile/magic/wand/magic_carp +/obj/item/ammo_casing/magic/wand/magic_missle + projectile_type = /obj/item/projectile/magic/wand/magic_missle + /* /obj/item/ammo_casing/magic/death diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 0817d62acfaa..55e57cefe787 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -1,7 +1,7 @@ /obj/item/weapon/gun/magic/wand/healing name = "wand of healing" - desc = "An artefact that uses healing magics to heal the living and revive the dead. Rarely utilized on others, for some reason" - ammo_type = /obj/item/ammo_casing/magic/change + desc = "Артефакт, способный привести в чувства любое сушество.. пока оно живо. Судя по небольшой надписи, кольцо на жезле ''служит спусковым крючком'' " + ammo_type = /obj/item/ammo_casing/magic/wand/heal icon_state = "staffofchange" item_state = "staffofchange" fire_delay = 120 @@ -52,13 +52,13 @@ fire_sound = 'sound/magic/Staff_Door.ogg' /obj/item/weapon/gun/magic/wand/broken_mirror - name = "Жезл разбитого стекла" + name = "Жезл разбитого зеркала" icon_state = "lavastaff" item_state = "lavastaff" - desc = "Артефакт, способный до неузнаваимости поменять внешний вид гуманоида. Судя по небольшой надписи, кольцо на жезле ''служит спусковым крючком''." + desc = "Артефакт, способный до неузнаваимости изуродовать личность жертвы. Судя по небольшой надписи, кольцо на жезле ''служит спусковым крючком''." ammo_type = /obj/item/ammo_casing/magic/wand/broken_mirror -/obj/item/weapon/gun/magic/wand/broken_mirror/zap_self(/mob/living/user) +/obj/item/weapon/gun/magic/wand/broken_mirror/zap_self(mob/living/user) ..() if(ishuman(user)) var/mob/living/carbon/human/T = user @@ -77,4 +77,4 @@ icon_state = "lavastaff" item_state = "lavastaff" desc = "Артефакт, призывающий сбивающую c ног магическую ракету. Судя по небольшой надписи, кольцо на жезле ''служит спусковым крючком''" - ammo_type = /obj/item/ammo_casing/magic/fireball + ammo_type = /obj/item/ammo_casing/magic/wand/magic_missle