diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e503af95..22abd0db 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -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 )) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 2e5d87d3..544d7983 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -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) // === diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index f9fda50d..01f94565 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -104,11 +104,11 @@ to_chat(user, "[src] is charging up. Please wait.") return - if(target_pad.teleporting) + if(target_pad?.teleporting) to_chat(user, "Target pad is busy. Please wait.") return - if(target_pad.stat & NOPOWER) + if(target_pad?.stat & NOPOWER) to_chat(user, "Target pad is not responding to ping.") return add_fingerprint(user) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index a5fb01a9..e572ccfc 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -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