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

Merge pull request #4097 from Tastyfish/botsgoddamn

Browse Source 
Tweaks/fixes some bot radio/language stuff, lazarus capsules
This commit is contained in:
Fox McCloud
2016-04-05 17:53:00 -04:00
parent 8556d5ed91 16c8e24f04
commit 59c0d41695
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/mine_items.dm
View File

@@ -211,7 +211,7 @@
return ..()
/obj/item/device/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
if(!istype(A, /mob/living/simple_animal))
if(!istype(A, /mob/living/simple_animal) || isbot(A))
return ..()
capture(A, user)
return 1

2
code/modules/mob/living/carbon/human/say.dm
View File

@@ -53,6 +53,8 @@
return 1
if (istype(other, /mob/living/silicon))
return 1
if (istype(other, /mob/living/simple_animal/bot))
return 1
if (istype(other, /mob/living/carbon/brain))
return 1
if (istype(other, /mob/living/carbon/slime))

2
code/modules/mob/living/silicon/say.dm
View File

@@ -56,6 +56,8 @@
return 1
if (istype(other, /mob/living/silicon))
return 1
if (istype(other, /mob/living/simple_animal/bot))
return 1
if (istype(other, /mob/living/carbon/brain))
return 1
return ..()

7
code/modules/mob/living/simple_animal/bot/bot.dm
View File

@@ -132,6 +132,13 @@
radio_config["[radio_channel]"] = 1
Radio.config(radio_config)
add_language("Galactic Common", 1)
add_language("Sol Common", 1)
add_language("Tradeband", 1)
add_language("Gutter", 1)
add_language("Trinary", 1)
default_language = all_languages["Galactic Common"]
bot_core = new bot_core_type(src)
spawn(30)
if(radio_controller && bot_filter)