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

Merge pull request #882 from CrAzYPiLoT-SS13/master

Browse Source 
Language fix + Corgi health status fix
This commit is contained in:
ZomgPonies
2015-04-25 17:50:05 -04:00
parent 2ea39812e7 a59f797752
commit 43e6e900fb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/default_language.dm
+5 -1
View File
@@ -5,7 +5,11 @@
set name = "Set Default Language"
set category = "IC"
if(language)
if(default_language == "unathi")
src << "<span class='notice'>You will now speak Sinta'unathi if you do not specify a language when speaking.</span>"
else if(default_language == "tajaran")
src << "<span class='notice'>You will now speak Siik'tajr if you do not specify a language when speaking.</span>"
else if(language)
src << "<span class='notice'>You will now speak [language] if you do not specify a language when speaking.</span>"
else
src << "<span class='notice'>You will now speak whatever your standard default language is if you do not specify one when speaking.</span>"
code/modules/mob/living/simple_animal/friendly/corgi.dm
+1 -1
View File
@@ -56,7 +56,7 @@
if(11 to 15) healths.icon_state = "health4"
if(6 to 10) healths.icon_state = "health5"
if(1 to 5) healths.icon_state = "health6"
else healths.icon_state = "health7"
if(0) healths.icon_state = "health7"
regenerate_icons()
/mob/living/simple_animal/corgi/Die()