From 8495fdd0849158067d75d98af5db370e4579b3c0 Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 12 Jul 2017 00:15:11 +0300 Subject: [PATCH] Runtimes, 10JUL2017 (#3003) Nukes a couple of RTs: --- code/game/machinery/doors/airlock.dm | 2 +- code/modules/mob/living/bot/farmbot.dm | 12 ++++++----- .../Chemistry-Reagents-Food-Drinks.dm | 21 +++++++++++-------- maps/aurora-2/aurora-3_sublevel.dmm | 14 ++++++------- maps/aurora-2/aurora-4_mainlevel.dmm | 10 ++++----- maps/aurora-2/aurora-6_surface.dmm | 2 +- maps/exodus/exodus-1.dmm | 4 ++-- 7 files changed, 35 insertions(+), 30 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 73f7147ad08..50181e10ad9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -451,7 +451,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/isWireCut(var/wireIndex) // You can find the wires in the datum folder. - return wires.IsIndexCut(wireIndex) + return QDELETED(wires) ? FALSE : wires.IsIndexCut(wireIndex) /obj/machinery/door/airlock/proc/canAIControl() return ((src.aiControlDisabled!=1) && (!src.isAllPowerLoss())); diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 98c17383cb9..6120398a646 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -141,11 +141,13 @@ if(path.len && frustration < 5) if(path[1] == loc) path -= path[1] - var/t = step_towards(src, path[1]) - if(t) - path -= path[1] - else - ++frustration + + if (path.len) + var/t = step_towards(src, path[1]) + if(t) + path -= path[1] + else + ++frustration else path = list() target = null diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 8a8b97f7b02..e1a38d82137 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -10,14 +10,14 @@ taste_description = "boiled cabbage" /datum/reagent/kois/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - if(isvaurca(M)) - M.heal_organ_damage(0.8 * removed, 0) - M.nutrition += nutriment_factor * removed // For hunger and fatness - M.add_chemical_effect(CE_BLOODRESTORE, 6 * removed) - else - M.adjustToxLoss(1.5 * removed) - return - ..() + if(isvaurca(M)) + M.heal_organ_damage(0.8 * removed, 0) + M.nutrition += nutriment_factor * removed // For hunger and fatness + M.add_chemical_effect(CE_BLOODRESTORE, 6 * removed) + else + M.adjustToxLoss(1.5 * removed) + return + ..() /datum/reagent/nutriment name = "Nutriment" @@ -33,7 +33,6 @@ color = "#664330" /datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount) - if(!islist(newdata) || !newdata.len) return for(var/i in 1 to newdata.len) @@ -44,6 +43,10 @@ var/totalFlavor = 0 for(var/i in 1 to data.len) totalFlavor += data[data[i]] + + if (!totalFlavor) + return + for(var/i in 1 to data.len) //cull the tasteless if(data[data[i]]/totalFlavor * 100 < 10) data[data[i]] = null diff --git a/maps/aurora-2/aurora-3_sublevel.dmm b/maps/aurora-2/aurora-3_sublevel.dmm index e8e77845da1..f3441a5ff11 100644 --- a/maps/aurora-2/aurora-3_sublevel.dmm +++ b/maps/aurora-2/aurora-3_sublevel.dmm @@ -1538,7 +1538,7 @@ }, /obj/machinery/door/airlock/glass_engineering{ name = "Break Room"; - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1565,7 +1565,7 @@ "di" = ( /obj/machinery/door/airlock/engineering{ name = "Restrooms"; - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1779,7 +1779,7 @@ /obj/machinery/door/airlock/glass_engineering{ name = "Tesla Bay"; req_access = list(11); - req_one_access = null + req_one_access = list() }, /turf/simulated/floor/tiled, /area/outpost/engineering/power) @@ -2232,7 +2232,7 @@ }, /obj/machinery/door/airlock/glass_engineering{ name = "Storage"; - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2245,7 +2245,7 @@ "er" = ( /obj/machinery/door/airlock/glass_engineering{ name = "Storage"; - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/door/firedoor, @@ -2685,7 +2685,7 @@ pixel_x = 0 }, /obj/machinery/door/airlock/maintenance_hatch{ - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3521,7 +3521,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/door/firedoor, diff --git a/maps/aurora-2/aurora-4_mainlevel.dmm b/maps/aurora-2/aurora-4_mainlevel.dmm index e520ce723d9..36ae2d6a81c 100644 --- a/maps/aurora-2/aurora-4_mainlevel.dmm +++ b/maps/aurora-2/aurora-4_mainlevel.dmm @@ -6605,7 +6605,7 @@ /area/engineering/engine_monitoring) "anB" = ( /obj/machinery/door/airlock/maintenance{ - req_access = null; + req_access = list(); req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12034,7 +12034,7 @@ /obj/machinery/door/airlock/glass_engineering{ name = "Engineering Locker Room"; req_access = list(11); - req_one_access = null + req_one_access = list() }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19591,7 +19591,7 @@ "aJo" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(11); - req_one_access = null + req_one_access = list() }, /obj/structure/cable{ d1 = 1; @@ -34263,7 +34263,7 @@ /obj/machinery/smartfridge/secure/medbay{ name = "Dangerous Materials Storage"; req_access = list(33); - req_one_access = null + req_one_access = list() }, /obj/structure/cable/green{ d1 = 1; @@ -57125,7 +57125,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Bar Maintenance"; - req_access = null; + req_access = list(); req_one_access = list(12,25,28) }, /turf/simulated/floor/plating, diff --git a/maps/aurora-2/aurora-6_surface.dmm b/maps/aurora-2/aurora-6_surface.dmm index ecc49f219bc..a1a97978e10 100644 --- a/maps/aurora-2/aurora-6_surface.dmm +++ b/maps/aurora-2/aurora-6_surface.dmm @@ -7481,7 +7481,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ - req_access = null; + req_access = list(); req_one_access = list(12,61) }, /turf/simulated/floor/plating, diff --git a/maps/exodus/exodus-1.dmm b/maps/exodus/exodus-1.dmm index 7cd43b23488..920e86b78b0 100644 --- a/maps/exodus/exodus-1.dmm +++ b/maps/exodus/exodus-1.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aaa" = ( /turf/space, /area/space) @@ -19799,7 +19799,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; - req_access = null; + req_access = list(); req_one_access = list(35,28) }, /obj/machinery/door/firedoor,