cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
This commit is contained in:
Rolan7
2014-06-21 09:00:21 -04:00
parent 98367cb162 5cfa0df3d2
commit 7decfe8621
143 changed files with 3397 additions and 2349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+8 -14
View File
@@ -133,6 +133,12 @@
O.gender = (deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 2)-1) ? FEMALE : MALE
O.dna = dna
if(!dna.species)
O.dna.species = new /datum/species/human()
else
O.dna.species = new dna.species.type()
dna = null
if (newname) //if there's a name as an argument, always take that one over the current name
O.real_name = newname
@@ -475,20 +481,8 @@
if(!MP)
return 0 //Sanity, this should never happen.
// if(ispath(MP, /mob/living/simple_animal/space_worm)) //Goodbye Space Worms 2014
// return 0 //Unfinished. Very buggy, they seem to just spawn additional space worms everywhere and eating your own tail results in new worms spawning.
if(ispath(MP, /mob/living/simple_animal/construct/behemoth))
return 0 //I think this may have been an unfinished WiP or something. These constructs should really have their own class simple_animal/construct/subtype
if(ispath(MP, /mob/living/simple_animal/construct/armoured))
return 0 //Verbs do not appear for players. These constructs should really have their own class simple_animal/construct/subtype
if(ispath(MP, /mob/living/simple_animal/construct/wraith))
return 0 //Verbs do not appear for players. These constructs should really have their own class simple_animal/construct/subtype
if(ispath(MP, /mob/living/simple_animal/construct/builder))
return 0 //Verbs do not appear for players. These constructs should really have their own class simple_animal/construct/subtype
if(ispath(MP, /mob/living/simple_animal/construct))
return 0 //Verbs do not appear for players.
//Good mobs!
if(ispath(MP, /mob/living/simple_animal/cat))