Tweaks/fixes some bot radio/language stuff, lazarus capsules

This commit is contained in:
Tastyfish
2016-04-04 02:02:19 -04:00
parent 9e74cbcc1b
commit 16c8e24f04
5 changed files with 16 additions and 2 deletions
+4 -1
View File
@@ -90,9 +90,12 @@
race = "Artificial Life"
else if(isslime(M)) // NT knows a lot about slimes, but not aliens. Can identify slimes
race = "slime"
race = "Slime"
language = race
else if(isbot(M))
race = "Bot"
else if(isanimal(M))
race = "Domestic Animal"
language = race
+1 -1
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
@@ -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
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 ..()
@@ -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)