Fix a bunch of runtimes

This commit is contained in:
Markolie
2015-02-09 04:03:20 +01:00
parent 58323be9ad
commit d10451c567
14 changed files with 54 additions and 39 deletions
+4 -3
View File
@@ -199,8 +199,9 @@ Note: Must be placed west/left of and R&D console to function.
busy = 0
src.updateUsrDialog()
src.overlays += "protolathe_[stack.name]"
sleep(10)
src.overlays -= "protolathe_[stack.name]"
if(stack)
src.overlays += "protolathe_[stack.name]"
sleep(10)
src.overlays -= "protolathe_[stack.name]"
return
@@ -66,8 +66,9 @@
/obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/device/core_sampler))
src.geological_data.artifact_distance = rand(-100,100) / 100
src.geological_data.artifact_id = artifact_find.artifact_id
if(geological_data)
src.geological_data.artifact_distance = rand(-100,100) / 100
src.geological_data.artifact_id = artifact_find.artifact_id
var/obj/item/device/core_sampler/C = W
C.sample_item(src, user)
@@ -544,12 +544,14 @@
if(talkative)
new_item.talking_atom = new()
talking_atom.holder_atom = new_item
talking_atom.init()
if(talking_atom)
talking_atom.holder_atom = new_item
talking_atom.init()
del(src)
else if(talkative)
src.talking_atom = new()
talking_atom.holder_atom = src
talking_atom.init()
if(talking_atom)
talking_atom.holder_atom = src
talking_atom.init()