cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 15:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source
This commit is contained in:
PsiOmega
2014-11-25 10:33:47 +01:00
parent d744550d04 d98bf2f84d
commit 7386a881d7
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -39,21 +39,13 @@
greaterform = "Unathi"
uni_append = list(0x044,0xC5D) // 044C5D
/mob/living/carbon/monkey/initialize()
if (!species)
species = all_species[greaterform]
add_language(species.language)
/mob/living/carbon/monkey/New()
var/datum/reagents/R = new/datum/reagents(1000)
reagents = R
R.my_atom = src
//Ensure that the all_species list has been initialized.
//If not then this must be round-start and initialize() will
//be called directly by the master controller, later.
if (ticker && ticker.current_state >= GAME_STATE_SETTING_UP)
initialize()
species = all_species[greaterform]
add_language(species.language)
if(name == initial(name)) //To stop Pun-Pun becoming generic.
name = "[name] ([rand(1, 1000)])"