cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/modules/mob/mob_defines.dm
This commit is contained in:
Ren Erthilo
2012-04-04 20:19:23 +01:00
parent d4d509faee 0e4690938b
commit ebebfaabb3
42 changed files with 923 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/helpers.dm
+35 -18
View File
@@ -108,8 +108,8 @@
var/list/old_list = shufflelist.Copy()
while(old_list.len)
var/item = pick(old_list)
new_list += item
old_list -= item
new_list.Add(item)
old_list.Remove(item)
return new_list
/proc/uniquelist(var/list/L)
@@ -198,9 +198,18 @@
var/list/result = new()
while(Li <= L.len && Ri <= R.len)
if(sorttext(L[Li], R[Ri]) < 1)
result += R[Ri++]
var/item = R[Ri++]
if(R[item])
result[item] = R[item]
else
result += item
else
result += L[Li++]
var/item = L[Li++]
if(L[item])
result[item] = L[item]
else
result += item
if(Li <= L.len)
return (result + L.Copy(Li, 0))
@@ -772,6 +781,14 @@ Turf and target are seperate in case you want to teleport some distance from a t
select = input("AI signals detected:", "AI selection") in ais
return ais[select]
/proc/get_sorted_mobs()
var/new_list = list()
var/old_list = getmobs()
for(var/named in old_list)
new_list += old_list[named]
return new_list
/proc/getmobs()
var/list/mobs = sortmobs()
@@ -795,38 +812,38 @@ Turf and target are seperate in case you want to teleport some distance from a t
name += " \[dead\]"
creatures[name] = M
return creatures
return sortList(creatures)
/proc/sortmobs()
var/list/mob_list = list()
var/list/temp_list = list()
for(var/mob/living/silicon/ai/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/silicon/pai/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/silicon/robot/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/carbon/human/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/carbon/brain/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/carbon/alien/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/dead/observer/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/new_player/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/carbon/monkey/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/carbon/metroid/M in world)
mob_list.Add(M)
temp_list.Add(M)
for(var/mob/living/simple_animal/M in world)
mob_list.Add(M)
temp_list.Add(M)
// for(var/mob/living/silicon/hivebot/M in world)
// mob_list.Add(M)
// for(var/mob/living/silicon/hive_mainframe/M in world)
// mob_list.Add(M)
return mob_list
return temp_list
/proc/convert2energy(var/M)
var/E = M*(SPEED_OF_LIGHT_SQ)