From 2ab35a05fdbd5014cd58b79ffefdaadb6d874410 Mon Sep 17 00:00:00 2001 From: coiax Date: Sun, 29 Jan 2017 17:23:44 +0000 Subject: [PATCH] Mobs polymorphed into silicons are lawless (#23216) :cl: coiax add: Any silicons created by bolts of change have no laws. add: Cyborgs are immune to polymorph while changing module. /:cl: --- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 ++ code/modules/projectiles/projectile/magic.dm | 3 +++ 2 files changed, 5 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 20fce3d5dd4..95bd7d599c8 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -191,6 +191,7 @@ /obj/item/weapon/robot_module/proc/do_transform_animation() var/mob/living/silicon/robot/R = loc + R.notransform = TRUE var/obj/effect/overlay/temp/decoy/fading/fivesecond/ANM = new /obj/effect/overlay/temp/decoy/fading/fivesecond(R.loc, R) ANM.layer = R.layer - 0.01 new /obj/effect/overlay/temp/small_smoke(R.loc) @@ -210,6 +211,7 @@ if(!prev_lockcharge) R.SetLockdown(0) R.anchored = FALSE + R.notransform = FALSE R.notify_ai(2) if(R.hud_used) R.hud_used.update_robot_modules_display() diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 2065289d85c..961aa9a2a08 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -202,6 +202,9 @@ new_mob.job = "Cyborg" var/mob/living/silicon/robot/Robot = new_mob Robot.mmi.transfer_identity(M) //Does not transfer key/client. + Robot.clear_inherent_laws() + Robot.clear_zeroth_law(0) + Robot.connected_ai = null if("slime") new_mob = new /mob/living/simple_animal/slime/random(M.loc) if("xeno")