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

Merge pull request #104 from SamCroswell/master

Browse Source 
Minor Hand Tele Change, Depot Change
This commit is contained in:
Fox-McCloud
2014-12-20 20:32:39 -05:00
parent f8abbc058a 31dbe4c9e5
commit 0c3d9bff00
4 changed files with 12466 additions and 12463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/ZomgPonies/karma.dm
View File
code/game/objects/items/weapons/teleportation.dm
+3 -1
View File
@@ -149,9 +149,12 @@ Frequency:
else
L["[com.id] (Inactive)"] = com.target
var/list/turfs = list( )
var/area/A
for(var/turf/T in orange(10))
if(T.x>world.maxx-8 || T.x<8) continue //putting them at the edge is dumb
if(T.y>world.maxy-8 || T.y<8) continue
A = get_area(T)
if (A.tele_proof == 1) continue // Telescience-proofed areas require a beacon.
turfs += T
if(turfs.len)
L["None (Dangerous)"] = pick(turfs)
@@ -170,4 +173,3 @@ Frequency:
active_portals++
src.add_fingerprint(user)
return
maps/cyberiad.dmm
+12462 -12461
View File
File diff suppressed because it is too large Load Diff
paradise.dme
+1 -1
View File
@@ -1022,7 +1022,6 @@
#include "code\modules\hydroponics\seed_mobs.dm"
#include "code\modules\hydroponics\seeds.dm"
#include "code\modules\hydroponics\vines.dm"
#include "code\modules\karma\karma.dm"
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
#include "code\modules\library\lib_readme.dm"
@@ -1616,6 +1615,7 @@
#include "code\WorkInProgress\Sayu\programmable.dm"
#include "code\WorkInProgress\Sayu\random_items.dm"
#include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
#include "code\WorkInProgress\ZomgPonies\karma.dm"
#include "code\WorkInProgress\ZomgPonies\clothing\civilian.dm"
#include "code\WorkInProgress\ZomgPonies\mobs\pony.dm"
#include "code\WorkInProgress\ZomgPonies\oldcode\turntable.dm"