Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

This commit is contained in:
PsiOmega
2014-07-29 12:02:48 +02:00
parent a5f6d417a1
commit 2f8bb7e135
9 changed files with 62 additions and 27 deletions
-1
View File
@@ -32,7 +32,6 @@ var/list/ai_list = list()
var/obj/item/device/pda/ai/aiPDA = null
var/obj/item/device/multitool/aiMulti = null
var/obj/item/device/radio/headset/heads/ai_integrated/aiRadio = null
var/obj/item/device/camera/siliconcam/aiCamera = null
var/custom_sprite = 0 //For our custom sprites
//Hud stuff
@@ -61,6 +61,10 @@
flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
updateicon()
/mob/living/silicon/robot/drone/init()
new/obj/item/device/camera/siliconcam/drone_camera(src)
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
//Redefining some robot procs...
/mob/living/silicon/robot/drone/updatename()
real_name = "maintenance drone ([rand(100,999)])"
@@ -3,9 +3,6 @@
if (!master_cam)
return
if(!aiCamera)
aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
var/synced
synced = 0
for(var/datum/picture/z in aiCamera.aipictures)
@@ -65,7 +65,6 @@
var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console. Setting to one hides them.
var/braintype = "Cyborg"
var/pose
var/obj/item/device/camera/siliconcam/aiCamera = null //photography
/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0)
spark_system = new /datum/effect/effect/system/spark_spread()
@@ -139,11 +138,11 @@
hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
init()
if(istype(src,/mob/living/silicon/robot/drone))
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
else
playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
/mob/living/silicon/robot/proc/init()
new/obj/item/device/camera/siliconcam/robot_camera(src)
playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
// setup the PDA and its name
/mob/living/silicon/robot/proc/setup_PDA()
@@ -13,6 +13,8 @@
var/speak_exclamation = "declares"
var/speak_query = "queries"
var/obj/item/device/camera/siliconcam/aiCamera = null //photography
/mob/living/silicon/proc/show_laws()
return