cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 21:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Baystation12/dev' into ofStaffsAndChange

Browse Source 
Conflicts:
	code/modules/projectiles/projectile/change.dm
This commit is contained in:
Kelenius
2015-03-28 19:37:50 +03:00
parent bdeb4da5f4 6ec0c2e504
commit 47ad072225
399 changed files with 10330 additions and 18100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/projectile/change.dm
View File

@@ -36,13 +36,12 @@
W.dropped(M)
var/mob/living/new_mob
var/options = list("monkey", "robot", "slime")
var/options = list("robot", "slime")
for(var/t in all_species)
options += t
options -= "Xenomorph Queen"
if(ismonkey(M))
options -= "monkey"
options -= "Xenomorph"
if(isrobot(M))
options -= "robot"
if(isslime(M))
@@ -52,11 +51,8 @@
if(H.species)
options -= H.species.name
var/randomize = pick(options)
var/randomize = pick(options)
switch(randomize)
if("monkey")
new_mob = new /mob/living/carbon/monkey(M.loc)
new_mob.universal_speak = 1
if("robot")
new_mob = new /mob/living/silicon/robot(M.loc)
new_mob.gender = M.gender