From ccd2d137b76d92c12cdc5dcba53f6f4f02741c0d Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 21 Nov 2020 03:03:27 -0300 Subject: [PATCH 1/2] Fixes some dummy thicc runtimes --- code/_globalvars/lists/maintenance_loot.dm | 3 +-- code/game/area/areas.dm | 4 +-- code/game/machinery/quantum_pad.dm | 4 +-- code/game/objects/effects/anomalies.dm | 30 +++++++++++----------- 4 files changed, 20 insertions(+), 21 deletions(-) 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..b5b407cb 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 @@ -235,20 +235,20 @@ A.forceMove(newloc) spawn() - if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect - var/mob/M = A - if(M.client) - var/obj/blueeffect = new /obj(src) - blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH" - blueeffect.icon = 'icons/effects/effects.dmi' - blueeffect.icon_state = "shieldsparkles" - blueeffect.layer = FLASH_LAYER - blueeffect.plane = FULLSCREEN_PLANE - blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - M.client.screen += blueeffect - sleep(20) - M.client.screen -= blueeffect - qdel(blueeffect) + if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect + var/mob/M = A + if(M.client) + var/obj/blueeffect = new /obj(src) + blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH" + blueeffect.icon = 'icons/effects/effects.dmi' + blueeffect.icon_state = "shieldsparkles" + blueeffect.layer = FLASH_LAYER + blueeffect.plane = FULLSCREEN_PLANE + blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + M.client.screen += blueeffect + sleep(20) + M.client.screen -= blueeffect + qdel(blueeffect) ///////////////////// From f2bf2235c3e8ce75024ebdc83f2ef75cc235ccbf Mon Sep 17 00:00:00 2001 From: Dip Date: Sat, 21 Nov 2020 03:05:32 -0300 Subject: [PATCH 2/2] ahem --- code/game/objects/effects/anomalies.dm | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index b5b407cb..e572ccfc 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -235,20 +235,20 @@ A.forceMove(newloc) spawn() - if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect - var/mob/M = A - if(M.client) - var/obj/blueeffect = new /obj(src) - blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH" - blueeffect.icon = 'icons/effects/effects.dmi' - blueeffect.icon_state = "shieldsparkles" - blueeffect.layer = FLASH_LAYER - blueeffect.plane = FULLSCREEN_PLANE - blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - M.client.screen += blueeffect - sleep(20) - M.client.screen -= blueeffect - qdel(blueeffect) + if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect + var/mob/M = A + if(M.client) + var/obj/blueeffect = new /obj(src) + blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH" + blueeffect.icon = 'icons/effects/effects.dmi' + blueeffect.icon_state = "shieldsparkles" + blueeffect.layer = FLASH_LAYER + blueeffect.plane = FULLSCREEN_PLANE + blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + M.client.screen += blueeffect + sleep(20) + M.client.screen -= blueeffect + qdel(blueeffect) /////////////////////