Merge pull request #411 from Markolie/master

Bug fixes
This commit is contained in:
ZomgPonies
2015-02-24 14:29:14 -05:00
7 changed files with 14 additions and 8 deletions
+2 -1
View File
@@ -117,6 +117,7 @@ var/list/ai_list = list()
add_language("Galactic Common", 1)
add_language("Sol Common", 1)
add_language("Tradeband", 1)
add_language("Gutter", 0)
add_language("Sinta'unathi", 0)
add_language("Siik'tajr", 0)
add_language("Skrellian", 0)
@@ -125,7 +126,7 @@ var/list/ai_list = list()
add_language("Trinary", 1)
add_language("Chittin", 0)
add_language("Bubblish", 0)
add_language("Gutter", 0)
add_language("Clownish", 0)
if(!safety)//Only used by AIize() to successfully spawn an AI.
if (!B)//If there is no player/brain inside.
@@ -704,6 +704,7 @@
remove_language("Trinary")
remove_language("Chittin")
remove_language("Bubblish")
remove_language("Clownish")
src << "\blue Translator Module toggled OFF."
@@ -718,5 +719,6 @@
add_language("Trinary")
add_language("Chittin")
add_language("Bubblish")
add_language("Clownish")
src << "\blue Translator Module toggled ON."
@@ -62,6 +62,7 @@
R.add_language("Galactic Common", 1)
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Gutter", 0)
R.add_language("Sinta'unathi", 0)
R.add_language("Siik'tajr", 0)
R.add_language("Skrellian", 0)
@@ -70,7 +71,7 @@
R.add_language("Trinary", 1)
R.add_language("Chittin", 0)
R.add_language("Bubblish", 0)
R.add_language("Gutter", 0)
R.add_language("Clownish",0)
/obj/item/weapon/robot_module/standard
name = "standard robot module"
@@ -270,6 +271,7 @@
R.add_language("Galactic Common", 1)
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Gutter", 1)
R.add_language("Sinta'unathi", 1)
R.add_language("Siik'tajr", 1)
R.add_language("Skrellian", 1)
@@ -278,7 +280,7 @@
R.add_language("Trinary", 1)
R.add_language("Chittin", 1)
R.add_language("Bubblish", 1)
R.add_language("Gutter", 1)
R.add_language("Clownish",1)
/*
/obj/item/weapon/robot_module/clerical //Whyyyyy?
@@ -46,7 +46,8 @@
spray(A)
playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.changeNext_move(CLICK_CD_RANGE*2)
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")