cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up monkey initialization

Browse Source
This commit is contained in:
mwerezak
2014-11-23 13:44:59 -05:00
parent 8878b3e107
commit feaa27fff1
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/global_lists.dm
View File

@@ -49,7 +49,7 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
/////Initial Building///// /////Initial Building/////
////////////////////////// //////////////////////////
/hook/startup/proc/makeDatumRefLists() /proc/makeDatumRefLists()
var/list/paths var/list/paths
//Hair - Initialise all /datum/sprite_accessory/hair into an list indexed by hair-style name //Hair - Initialise all /datum/sprite_accessory/hair into an list indexed by hair-style name

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

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

12
code/world.dm
View File

@@ -1,3 +1,15 @@
var/global/datum/global_init/init = new ()
/*
Pre-map initialization stuff should go here.
*/
/datum/global_init/New()
makeDatumRefLists()
del(src)
/world /world
mob = /mob/new_player mob = /mob/new_player
turf = /turf/space turf = /turf/space