Merge pull request #704 from ArchieBeepBoop/dummyruntimes

I'M FIXING THESE RUNTIMES, WITH NO SURVIVORS.
This commit is contained in:
Dahlular
2020-11-21 23:03:08 -07:00
committed by GitHub
4 changed files with 6 additions and 7 deletions
+1 -2
View File
@@ -118,6 +118,5 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/autosurgeon/vagina = 1,
/obj/item/autosurgeon/breasts = 1,
/obj/item/autosurgeon/womb = 1,
/obj/item/toy/plush/random = 1,
"" = 3
/obj/item/toy/plush/random = 1
))
+2 -2
View File
@@ -86,8 +86,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
var/turf/picked = AR.contents[1]
if (picked && is_station_level(picked.z))
GLOB.teleportlocs[AR.name] = AR
sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc)
if(GLOB.teleportlocs.len) //DON'T TRY TO TIMSORT THINGS THAT HAVE NOTHING. FUCK.
sortTim(GLOB.teleportlocs, /proc/cmp_text_dsc)
// ===
+2 -2
View File
@@ -104,11 +104,11 @@
to_chat(user, "<span class='warning'>[src] is charging up. Please wait.</span>")
return
if(target_pad.teleporting)
if(target_pad?.teleporting)
to_chat(user, "<span class='warning'>Target pad is busy. Please wait.</span>")
return
if(target_pad.stat & NOPOWER)
if(target_pad?.stat & NOPOWER)
to_chat(user, "<span class='warning'>Target pad is not responding to ping.</span>")
return
add_fingerprint(user)
+1 -1
View File
@@ -197,7 +197,7 @@
do_teleport(AM, locate(AM.x, AM.y, AM.z), 8, channel = TELEPORT_CHANNEL_BLUESPACE)
/obj/effect/anomaly/bluespace/detonate()
var/turf/T = safepick(get_area_turfs(impact_area))
var/turf/T = pick(get_area_turfs(impact_area))
if(T)
// Calculate new position (searches through beacons in world)
var/obj/item/beacon/chosen