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

AI's can now understand pAI speech

Browse Source 
Tidied up some.
This commit is contained in:
SkyMarshal
2012-02-06 11:02:49 -07:00
parent 3feb42e795
commit 664c6b7dec
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
baystation12.dme
View File

@@ -144,10 +144,7 @@
#define FILE_DIR "code/unused/spacecraft" #define FILE_DIR "code/unused/spacecraft"
#define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
#define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/mapload"
#define FILE_DIR "code/WorkInProgress/Mini" #define FILE_DIR "code/WorkInProgress/Mini"
#define FILE_DIR "code/WorkInProgress/organs" #define FILE_DIR "code/WorkInProgress/organs"
@@ -179,7 +176,6 @@
#define FILE_DIR "icons/vending_icons" #define FILE_DIR "icons/vending_icons"
#define FILE_DIR "interface" #define FILE_DIR "interface"
#define FILE_DIR "maps" #define FILE_DIR "maps"
#define FILE_DIR "maps/backup"
#define FILE_DIR "sound" #define FILE_DIR "sound"
#define FILE_DIR "sound/ambience" #define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/announcer" #define FILE_DIR "sound/announcer"

11
code/defines/procs/gamehelpers.dm
View File

@@ -290,13 +290,4 @@ proc/check_can_reach(atom/user, atom/target)
del(D) del(D)
// ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE ------- // ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE -------
return ok return ok
//cael - not sure if there's an equivalent proc, but if there is i couldn't find it
//searches to see if M contains O somewhere
proc/is_carrying(var/M as mob, var/O as obj)
while(!istype(O,/area))
if(O:loc == M)
return 1
O = O:loc
return 0

3
code/game/mecha/mecha.dm
View File

@@ -118,7 +118,8 @@
return return
var/obj/mecha/Mech = M.loc var/obj/mecha/Mech = M.loc
spawn() //this helps prevent clickspam fest. spawn() //this helps prevent clickspam fest.
if (Mech && !(is_carrying(M,object)) ) //cael - make sure you cant drill shit in your invent var/list/mob_contents = M.get_contents()
if (Mech && !(locate(object) in mob_contents)) //cael - make sure you cant drill shit in your invent
Mech.click_action(object,M) Mech.click_action(object,M)
else else
return ..() return ..()

6
code/modules/mob/say.dm
View File

@@ -44,14 +44,16 @@
M.show_message(rendered, 2) M.show_message(rendered, 2)
/mob/proc/say_understands(var/mob/other) /mob/proc/say_understands(var/mob/other)
if(!other) // if(!other)
return 1 // return 1
if (src.stat == 2) if (src.stat == 2)
return 1 return 1
else if (istype(other, src.type)) else if (istype(other, src.type))
return 1 return 1
else if(other.universal_speak || src.universal_speak) else if(other.universal_speak || src.universal_speak)
return 1 return 1
else if(isAI(src) && ispAI(other))
return 1
return 0 return 0
/mob/proc/say_quote(var/text) /mob/proc/say_quote(var/text)