diff --git a/baystation12.dme b/baystation12.dme index f9c0cf04725..ba6a1f7196d 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -170,7 +170,6 @@ #define FILE_DIR "code/WorkInProgress/Apples" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" @@ -210,7 +209,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "maps/RandomZLevels" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 0514c12cc34..fcb6643af8f 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -35,6 +35,7 @@ end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) usr << "\blue [src] can only be laid horizontally or vertically." + return var/turf/cur = start var/dir diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index abc41257458..5bb04339ba3 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,4 +1,3 @@ - /datum/ai_laws var/name = "Unknown Laws" var/randomly_selectable = 0 @@ -93,9 +92,9 @@ src.inherent = list() /datum/ai_laws/proc/add_supplied_law(var/number, var/law) -// while (src.supplied.len < number + 1) -// src.supplied += "" -//Infinite loop + // This is not an infinite loop, don't be an idiot Sky + while (src.supplied.len < number + 1) + src.supplied += "" src.supplied[number + 1] = law diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index 7b8c20e33d2..3de45c7d960 100755 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -1278,14 +1278,10 @@ proc/process_ghost_teleport_locs() //Anomaly -/area/anomaly +/area/anomaly/lab name = "Anomaly Lab" icon_state = "anomaly" -/area/anomaly/shuttledock - name = "Research Shuttle Dock" - icon_state = "anomaly" - /area/anomaly/outpost name = "Research Outpost" icon_state = "anomaly" diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index 341d5944b5a..fa7b71f4735 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -1753,6 +1753,9 @@ proc/oview_or_orange(distance = world.view , center = usr , type) return /proc/stringsplit(txt, character) + if(length(character) < 1) //Do not infinite loop when splitting on "" or null + return list(txt) + var/cur_text = txt var/last_found = 1 var/found_char = findtext(cur_text,character) diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 33956b55d68..316663a5be7 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -174,7 +174,7 @@ if(on) user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) else - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - (brightness_on - 1), user.LuminosityBlue) /obj/item/clothing/head/helmet/space/rig/pickup(mob/user) if(on) diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index fb0adfec859..2b919028882 100644 --- a/code/game/objects/door_assembly.dm +++ b/code/game/objects/door_assembly.dm @@ -379,7 +379,7 @@ obj/structure/door_assembly src.mineral = "glass" src.name = "Near finished Window Airlock Assembly" src.airlock_type = /obj/machinery/door/airlock/glass - src.base_icon_state = "door_as_glass" //this will be applied to the icon_state with the correct state number at the proc's end. + src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end. if(/obj/item/stack/sheet/gold) if(G.amount>=2) playsound(src.loc, 'Crowbar.ogg', 100, 1) diff --git a/code/game/player/admin_report.dm b/code/game/player/admin_report.dm index f2dd855c256..b0f43741d02 100644 --- a/code/game/player/admin_report.dm +++ b/code/game/player/admin_report.dm @@ -69,6 +69,7 @@ proc/load_reports() // check if there are any unhandled reports client/proc/unhandled_reports() + if(!src.holder) return 0 var/list/reports = load_reports() for(var/datum/admin_report/N in reports) diff --git a/code/game/vote.dm b/code/game/vote.dm index 4ec854055f6..97b45c72d61 100644 --- a/code/game/vote.dm +++ b/code/game/vote.dm @@ -264,9 +264,11 @@ text += "[vote.endwait()] until voting is closed.
" if(vote.instant_restart) - text += "Restart the world? ONLY PRESS THIS IF THERE'S A ROUND-BREAKING GLITCH.