Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3

# Conflicts:
#	code/game/objects/items/devices/multitool.dm
This commit is contained in:
Datraen
2016-05-19 17:31:25 -04:00
200 changed files with 10329 additions and 8330 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ var/religion_name = null
return capitalize(name)
/proc/system_name()
return "Vir"
return starsys_name
/proc/station_name()
if (station_name)
+7
View File
@@ -324,4 +324,11 @@ proc/TextPreview(var/string,var/len=40)
return 1
return 0
/**
* Strip out the special beyond characters for \proper and \improper
* from text that will be sent to the browser.
*/
/proc/strip_improper(var/text)
return replacetext(replacetext(text, "\proper", ""), "\improper", "")
#define gender2text(gender) capitalize(gender)