cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 15:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

AI Card should no longer kill its targets... for real this time.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@80 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
only.lurking@gmail.com
2010-09-08 09:43:57 +00:00
parent 505665db80
commit 042743c8ca
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/devices/aicard.dm
View File

@@ -10,6 +10,12 @@
attack(mob/living/silicon/ai/M as mob, mob/user as mob)
if(!istype(M, /mob/living/silicon/ai))
return ..()
// ** Bugfix for r74 **
if(istype(M, /mob/living/silicon/decoy)) // Don't branch this out into a separate attack(), it overwrites the first definition.
M.death() // We typecast in the function's arguments, but it doesn't actually typecheck
user << "<b>ERROR ERROR ERROR</b>" // (beyond, I suspect, the big four ATOMs), typechecking for subtypes of one of the ATOMs needs
return 0 // to occur in the function itself. -- TLE
if(src.contents.len > 0)
// Already have an AI
if(M.client)
@@ -35,7 +41,6 @@
return
else
var/mob/living/silicon/ai/O = new /mob/living/silicon/ai( src )
O.invisibility = 0
O.canmove = 0
O.name = M.name
@@ -52,8 +57,4 @@
M.icon_state = "ai-crash"
src.icon_state = "aicard-full"
O << "You have been downloaded to a mobile storage device. Remote device connection severed."
user << "<b>Transfer succeeded</b>: [O.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
attack(mob/living/silicon/decoy/M as mob, mob/user as mob)
M.death()
user << "<b>ERROR ERROR ERROR</b>"
user << "<b>Transfer succeeded</b>: [O.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."