mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 19:17:50 +01:00
Swap Meet Update:
- Both wizard and ghost teleport lists are now in alphabetical order. - pico-manipulator now has an icon - Ghosts can, once again, teleport to the mining station. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1141 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -57,6 +57,17 @@ proc/process_teleport_locs()
|
||||
teleportlocs += AR.name
|
||||
teleportlocs[AR.name] = AR
|
||||
|
||||
var/not_in_order = 0
|
||||
do
|
||||
not_in_order = 0
|
||||
if(teleportlocs.len <= 1)
|
||||
break
|
||||
for(var/i = 1, i <= (teleportlocs.len - 1), i++)
|
||||
if(sorttext(teleportlocs[i], teleportlocs[i+1]) == -1)
|
||||
teleportlocs.Swap(i, i+1)
|
||||
not_in_order = 1
|
||||
while(not_in_order)
|
||||
|
||||
var/list/ghostteleportlocs = list()
|
||||
|
||||
proc/process_ghost_teleport_locs()
|
||||
@@ -66,10 +77,22 @@ proc/process_ghost_teleport_locs()
|
||||
ghostteleportlocs += AR.name
|
||||
ghostteleportlocs[AR.name] = AR
|
||||
var/turf/picked = pick(get_area_turfs(AR.type))
|
||||
if (picked.z == 1 || picked.z == 8)
|
||||
if (picked.z == 1 || picked.z == 5)
|
||||
ghostteleportlocs += AR.name
|
||||
ghostteleportlocs[AR.name] = AR
|
||||
|
||||
var/not_in_order = 0
|
||||
do
|
||||
not_in_order = 0
|
||||
if(ghostteleportlocs.len <= 1)
|
||||
break
|
||||
for(var/i = 1, i <= (ghostteleportlocs.len - 1), i++)
|
||||
if(sorttext(ghostteleportlocs[i], ghostteleportlocs[i+1]) == -1)
|
||||
ghostteleportlocs.Swap(i, i+1)
|
||||
not_in_order = 1
|
||||
while(not_in_order)
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------------*/
|
||||
|
||||
/area/engine/
|
||||
|
||||
@@ -1908,7 +1908,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
||||
/obj/item/weapon/stock_parts/scanning_module/phasic
|
||||
name = "Phasic Scanning Module"
|
||||
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
|
||||
icon_state = "scan_module"
|
||||
origin_tech = "magnets=5"
|
||||
rating = 3
|
||||
m_amt = 50
|
||||
@@ -1917,7 +1916,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
||||
/obj/item/weapon/stock_parts/manipulator/pico
|
||||
name = "Pico-Manipulator"
|
||||
desc = "A tiny little manipulator used in the construction of certain devices."
|
||||
icon_state = "pico_mani"
|
||||
origin_tech = "materials=5,programming=2"
|
||||
rating = 3
|
||||
m_amt = 30
|
||||
@@ -1925,7 +1923,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
||||
/obj/item/weapon/stock_parts/micro_laser/ultra
|
||||
name = "Ultra-High-Power Micro-laser"
|
||||
desc = "A tiny laser used in certain devices."
|
||||
icon_state = "micro_laser"
|
||||
origin_tech = "magnets=5"
|
||||
rating = 3
|
||||
m_amt = 10
|
||||
@@ -1934,7 +1931,6 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
|
||||
/obj/item/weapon/stock_parts/matter_bin/super
|
||||
name = "Super Matter Bin"
|
||||
desc = "A container for hold compressed matter awaiting re-construction."
|
||||
icon_state = "matter_bin"
|
||||
origin_tech = "materials=5"
|
||||
rating = 3
|
||||
m_amt = 80
|
||||
Reference in New Issue
Block a user