diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index c3f52d7131f..f191b9eed06 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -301,7 +301,8 @@ var/list/mob/living/forced_ambiance_list = new // Otherwise, stop playing the ambient hum. else L << sound(null, channel = 3) - L.client.ambient_hum_playing = FALSE + if(L.client) + L.client.ambient_hum_playing = FALSE // Start playing music, if it exists. if(src.music.len && L && L.client && (L.client.prefs.sfx_toggles & ASFX_MUSIC)) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 28f6ecf60c9..7c8870c32db 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -364,7 +364,7 @@ update_grid_location(old_loc, src) /atom/movable/proc/update_grid_location(atom/old_loc) - if(!HAS_SPATIAL_GRID_CONTENTS(src)) + if(!HAS_SPATIAL_GRID_CONTENTS(src) || SSspatial_grid.init_state < SS_INITSTATE_DONE) return var/turf/old_turf = get_turf(old_loc) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 5d3dfeb9236..94ce4694c5b 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -92,10 +92,11 @@ network.gases -= air_contents anchored = 0 + if(connected_port) + connected_port.toggle_process() + connected_port.connected_device = null - connected_port.connected_device = null connected_port = null - connected_port.toggle_process() return 1 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index a9c2d25f934..23ed9f42fcd 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -520,6 +520,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co comment.posted = "[worldtime2text()]" viewing_story.comments += comment to_chat(usr, "Comment successfully added!") + src.viewing_message = viewing_story src.screen = 22 src.updateUsrDialog() diff --git a/code/modules/cooking/machinery/cooking_machines/grill.dm b/code/modules/cooking/machinery/cooking_machines/grill.dm index 54c08b2fa4c..39e5a1d1941 100644 --- a/code/modules/cooking/machinery/cooking_machines/grill.dm +++ b/code/modules/cooking/machinery/cooking_machines/grill.dm @@ -71,7 +71,7 @@ icon_state = on_icon else icon_state = off_icon - grill_loop.stop() + grill_loop?.stop() if(length(cooking_objs)) grill_loop.start() var/datum/cooking_item/CI = cooking_objs[1] diff --git a/code/modules/mob/living/carbon/slime/slime_extractor.dm b/code/modules/mob/living/carbon/slime/slime_extractor.dm index b77a4ba6be0..38116f6f783 100644 --- a/code/modules/mob/living/carbon/slime/slime_extractor.dm +++ b/code/modules/mob/living/carbon/slime/slime_extractor.dm @@ -81,6 +81,10 @@ /obj/machinery/slime_extractor/proc/extraction_process(var/slime) var/mob/living/carbon/slime/extracted_slime = extract_slimes[slime] + if(!extracted_slime) + extract_slimes -= slime + update_icon() + return for(var/i = 1 to extracted_slime.cores + 1) var/obj/extract = new extracted_slime.coretype(get_turf(src)) var/obj/item/storage/slimes/slime_bag = locate() in range(1, get_turf(src)) diff --git a/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm b/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm index 0cddc02aca5..09346d845f4 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm @@ -51,6 +51,9 @@ var/mob/living/heavy_vehicle/HV = user if(istype(W, /obj/item/mecha_equipment/clamp)) var/obj/item/mecha_equipment/clamp/CL = W + if(!length(CL.carrying)) + to_chat(user, SPAN_WARNING("\The [CL] is empty.")) + return TRUE if(istype(CL.carrying[1], /obj/item/ship_ammunition)) var/obj/item/ship_ammunition/SA = CL.carrying[1] return load_ammo(SA, HV) @@ -100,4 +103,4 @@ icon_state = "viewport_zavod" /obj/structure/viewport/unathi - icon_state = "viewport_unathi" \ No newline at end of file + icon_state = "viewport_unathi" diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 7e99d6087e1..886bf5bf303 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -25,8 +25,8 @@ playsound(loc, W.usesound, 50, 1) anchored = !anchored user.visible_message( - SPAN_NOTICE(anchored ? "\The [user] fastens \the [src] to \the [loc]." : "\The unfastens \the [src] from \the [loc]."), - SPAN_NOTICE(anchored ? "You fasten \the [src] to \the [loc]." : "You unfasten \the [src] from \the [loc]."), + SPAN_NOTICE("[anchored ? "\The [user] fastens \the [src] to \the [loc]." : "\The unfastens \the [src] from \the [loc]."]"), + SPAN_NOTICE("[anchored ? "You fasten \the [src] to \the [loc]." : "You unfasten \the [src] from \the [loc]."]"), "You hear a ratchet." ) return