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

Merge pull request #365 from Markolie/master

Browse Source 
Respawn as the new cargo mobs, language fixes
This commit is contained in:
ZomgPonies
2015-02-20 15:19:06 -05:00
parent c1238e3eeb f17c266919
commit 108abfcf75
5 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/say.dm
+5 -1
View File
@@ -107,7 +107,11 @@ proc/get_radio_key_from_channel(var/channel)
listening_obj |= O
for(var/mob/M in player_list)
if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS))
if (!M.client)
continue //skip monkeys and leavers
if (istype(M, /mob/new_player))
continue
if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS) && src.client) // src.client is so that ghosts don't have to listen to mice
listening |= M
continue
if(M.loc && M.locs[1] in hearturfs)
code/modules/mob/living/silicon/ai/ai.dm
+1
View File
@@ -114,6 +114,7 @@ var/list/ai_list = list()
//Languages
add_language("Robot Talk", 1)
add_language("Galactic Common", 1)
add_language("Sol Common", 1)
add_language("Tradeband", 1)
add_language("Sinta'unathi", 0)
code/modules/mob/living/silicon/pai/pai.dm
+1
View File
@@ -84,6 +84,7 @@
radio = card.radio
//Default languages without universal translator software
add_language("Galactic Common", 1)
add_language("Sol Common", 1)
add_language("Tradeband", 1)
add_language("Gutter", 1)
code/modules/mob/living/silicon/robot/robot_modules.dm
+3 -1
View File
@@ -59,6 +59,7 @@
/obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R)
//full set of languages
R.add_language("Galactic Common", 1)
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Sinta'unathi", 0)
@@ -266,6 +267,7 @@
/obj/item/weapon/robot_module/butler/add_languages(var/mob/living/silicon/robot/R)
//full set of languages
R.add_language("Galactic Common", 1)
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Sinta'unathi", 1)
@@ -371,7 +373,7 @@
src.emag.reagents.add_reagent("pacid", 125)
src.emag.reagents.add_reagent("sacid", 125)
/obj/item/weapon/robot_module/butler/add_languages(var/mob/living/silicon/robot/R)
/obj/item/weapon/robot_module/alien/hunter/add_languages(var/mob/living/silicon/robot/R)
..()
R.add_language("xenocommon", 1)
code/modules/mob/transform_procs.dm
+12
View File
@@ -435,6 +435,12 @@
return 1 // ZOMG PONIES WHEEE
if(ispath(MP, /mob/living/simple_animal/fox))
return 1
if(ispath(MP, /mob/living/simple_animal/chick))
return 1
if(ispath(MP, /mob/living/simple_animal/pug))
return 1
if(ispath(MP, /mob/living/simple_animal/butterfly))
return 1
//Not in here? Must be untested!
return 0
@@ -460,6 +466,12 @@
return 1
if(ispath(MP, /mob/living/simple_animal/fox))
return 1
if(ispath(MP, /mob/living/simple_animal/chick))
return 1
if(ispath(MP, /mob/living/simple_animal/pug))
return 1
if(ispath(MP, /mob/living/simple_animal/butterfly))
return 1
//Antag Creatures!
/* if(ispath(MP, /mob/living/simple_animal/hostile/carp) && !jobban_isbanned(src, "Syndicate"))