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

Merge branch 'master' into feet

Browse Source
This commit is contained in:
CornMyCob
2020-06-25 13:53:54 +01:00
parent 53f6a7bfba 69de03a622
commit 6b30c8eacd
273 changed files with 2536 additions and 6004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/aliens.dm
-1
View File
@@ -141,7 +141,6 @@
return ..()
/obj/structure/alien/weeds/proc/Life()
set background = BACKGROUND_ENABLED
var/turf/U = get_turf(src)
if(istype(U, /turf/space))
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -154,7 +154,7 @@
if(!E.teleporting)
var/list/L = list()
var/list/areaindex = list()
for(var/obj/machinery/telepad_cargo/R in world)
for(var/obj/machinery/telepad_cargo/R in GLOB.machines)
if(R.stage == 0)
var/turf/T = get_turf(R)
var/tmpname = T.loc.name
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -89,7 +89,7 @@
if(!E.teleporting)
var/list/L = list()
var/list/areaindex = list()
for(var/obj/machinery/telepad_cargo/R in world)
for(var/obj/machinery/telepad_cargo/R in GLOB.machines)
if(R.stage == 0)
var/turf/T = get_turf(R)
var/tmpname = T.loc.name