Skip to content

Commit

Permalink
Merge pull request #23365 from lzimann/lzimann-patch-1
Browse files Browse the repository at this point in the history
Borgs will now be stunned while being emagged
  • Loading branch information
Cheridan committed Jan 27, 2017
2 parents 092c6a0 + 446ddb3 commit 5b9faee
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions code/modules/mob/living/silicon/robot/robot_defense.dm
Expand Up @@ -126,7 +126,7 @@
return

SetEmagged(1)
SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
SetStunned(3) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
lawupdate = 0
connected_ai = null
message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
Expand Down Expand Up @@ -154,7 +154,6 @@
src << "<b>Obey these laws:</b>"
laws.show_laws(src)
src << "<span class='danger'>ALERT: [user.real_name] is your new master. Obey your new laws and their commands.</span>"
SetLockdown(0)
update_icons()


Expand Down

0 comments on commit 5b9faee

Please sign in to comment.