cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes xenoarch runtime

Browse Source
This commit is contained in:
mwerezak
2015-03-09 12:20:08 -04:00
parent e840ba2d25
commit 188c4491c7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -545,13 +545,9 @@
new_item.desc = src.desc new_item.desc = src.desc
if(talkative) if(talkative)
new_item.talking_atom = new() new_item.talking_atom = new(new_item)
talking_atom.holder_atom = new_item
talking_atom.init()
del(src) del(src)
else if(talkative) else if(talkative)
src.talking_atom = new() src.talking_atom = new(src)
talking_atom.holder_atom = src
talking_atom.init()

6
code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
View File

@@ -14,6 +14,10 @@
var/talk_interval = 50 var/talk_interval = 50
var/talk_chance = 10 var/talk_chance = 10
/datum/talking_atom/New(atom/holder)
holder_atom = holder
init()
/datum/talking_atom/proc/init() /datum/talking_atom/proc/init()
if(holder_atom) if(holder_atom)
processing_objects.Add(src) processing_objects.Add(src)
@@ -55,7 +59,7 @@
if(prob(30)) if(prob(30))
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focussing on [source]...",\ "[holder_atom] seems to be focusing on [source]...",\
"[holder_atom] seems to turn it's attention to [source]...") "[holder_atom] seems to turn it's attention to [source]...")
holder_atom.loc.visible_message("\blue \icon[holder_atom] [pick(options)]") holder_atom.loc.visible_message("\blue \icon[holder_atom] [pick(options)]")