diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 90ceb3a0d1f..c6979895b8c 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -231,7 +231,7 @@ if(3) A = new /obj/item/projectile/beam/pulse(loc) if(4) - A = new /obj/item/projectile/change(loc) + A = new /obj/item/projectile/magic/change(loc) if(5) A = new /obj/item/projectile/lasertag/blue(loc) if(6) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 74de3086a9c..78b669e2047 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -128,7 +128,7 @@ // Copy Mimic // -var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/cable, /obj/structure/window, /obj/item/projectile/animate) +var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/cable, /obj/structure/window, /obj/item/projectile/magic/animate) /mob/living/simple_animal/hostile/mimic/copy diff --git a/code/modules/projectiles/projectile/animate.dm b/code/modules/projectiles/projectile/animate.dm deleted file mode 100644 index c329f69d208..00000000000 --- a/code/modules/projectiles/projectile/animate.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/projectile/animate - name = "bolt of animation" - icon_state = "ice_1" - damage = 0 - damage_type = BURN - nodamage = 1 - flag = "energy" - -/obj/item/projectile/animate/Bump(var/atom/change) - if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects)) - var/obj/O = change - new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer) - ..() \ No newline at end of file diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm deleted file mode 100644 index e002314411a..00000000000 --- a/code/modules/projectiles/projectile/change.dm +++ /dev/null @@ -1,86 +0,0 @@ -/obj/item/projectile/change - name = "bolt of change" - icon_state = "ice_1" - damage = 0 - damage_type = BURN - nodamage = 1 - flag = "energy" - - on_hit(var/atom/change) - wabbajack(change) - - -/obj/item/projectile/change/proc/wabbajack (mob/M as mob in living_mob_list) - if(istype(M, /mob/living) && M.stat != DEAD) - if(M.notransform) return - M.notransform = 1 - M.canmove = 0 - M.icon = null - M.overlays.Cut() - M.invisibility = 101 - - if(istype(M, /mob/living/silicon/robot)) - var/mob/living/silicon/robot/Robot = M - if(Robot.mmi) del(Robot.mmi) - else - for(var/obj/item/W in M) - if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something - del(W) - continue - W.layer = initial(W.layer) - W.loc = M.loc - W.dropped(M) - - var/mob/living/new_mob - - var/randomize = pick("robot","slime","xeno","human") - switch(randomize) - if("robot") - new_mob = new /mob/living/silicon/robot(M.loc) - new_mob.gender = M.gender - new_mob.invisibility = 0 - new_mob.job = "Cyborg" - var/mob/living/silicon/robot/Robot = new_mob - Robot.mmi = new /obj/item/device/mmi(new_mob) - Robot.mmi.transfer_identity(M) //Does not transfer key/client. - if("slime") - new_mob = new /mob/living/carbon/slime(M.loc) - new_mob.universal_speak = 1 - if("xeno") - var/alien_caste = pick("Hunter","Sentinel","Drone","Larva") - switch(alien_caste) - if("Hunter") new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc) - if("Sentinel") new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc) - if("Drone") new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc) - else new_mob = new /mob/living/carbon/alien/larva(M.loc) - new_mob.universal_speak = 1 - if("human") - new_mob = new /mob/living/carbon/human(M.loc, delay_ready_dna=1) - if(M.gender == MALE) - new_mob.gender = MALE - new_mob.name = pick(first_names_male) - else - new_mob.gender = FEMALE - new_mob.name = pick(first_names_female) - new_mob.name += " [pick(last_names)]" - new_mob.real_name = new_mob.name - - var/datum/preferences/A = new() //Randomize appearance for the human - A.randomize_appearance_for(new_mob) - else - return - - for (var/obj/effect/proc_holder/spell/wizard/S in M.spell_list) - new_mob.AddSpell(new S.type) - - new_mob.a_intent = "harm" - if(M.mind) - M.mind.transfer_to(new_mob) - else - new_mob.key = M.key - - new_mob << "Your form morphs into that of a [randomize]." - - del(M) - return new_mob - diff --git a/paradise.dme b/paradise.dme index b94388425b1..2d679fe3a4f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1557,10 +1557,8 @@ #include "code\modules\projectiles\guns\projectile\revolver.dm" #include "code\modules\projectiles\guns\projectile\rocket.dm" #include "code\modules\projectiles\guns\projectile\shotgun.dm" -#include "code\modules\projectiles\projectile\animate.dm" #include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\bullets.dm" -#include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\magic.dm"