From 0b45e97b3d30e52094c7a5554e8cc74ebbb66d08 Mon Sep 17 00:00:00 2001 From: TalkingCactus Date: Tue, 28 Mar 2017 07:29:59 -0400 Subject: [PATCH 1/3] Automatic MC Re-Starter 9001 (#322) * fixed runtime in air.dm fix was made in LINDA_turf_tile.dm though * fixes runtime in corpse.dm * fixes runtime in species.dm * automatically restarts the MC sometimes When the timer SS crashes, here's the fix hardcoded with love * supermatter area icon * better admin logs * better mentorhelp message for admins * fixes map * removes depreciated var * MC rebooter 9001 --- code/controllers/subsystem/timer.dm | 6 +++--- code/modules/client/preferences.dm | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 35ed031ba2..c3bcb0e9b0 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -79,12 +79,12 @@ var/datum/controller/subsystem/timer/SStimer do var/datum/callback/callBack = timer.callBack if (!callBack) + message_admins("The timer SS has crashed because a timer did not return a callback. MC restarted automatically. Timer hash: [timer.hash]") qdel(timer) bucket_resolution = null //force bucket recreation - CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]") - //Temporary fix Recreate_MC() - message_admins("The timer SS has crashed. A full report can be found in the runtime viewer. MC restarted automatically.") + //I really don't know if I should keep this crash log in; I feel like it might cause problems. +// CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]") if (!timer.spent) spent += timer diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 74ee5f9e47..20a57f2d0e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -133,7 +133,6 @@ var/list/preferences_datums = list() //Mob preview var/icon/preview_icon = null - var/icon/nude_preview_icon = null //Jobs, uses bitflags var/job_civilian_high = 0 From 31d0f4cb1fea75299051ad4f3bd650f243fa496a Mon Sep 17 00:00:00 2001 From: katnep Date: Wed, 29 Mar 2017 22:11:00 +0100 Subject: [PATCH 2/3] Mining Vendor Redo (#298) * Mining Vendor Redo basically Re adds all the stuff i added back at the start of 6th port, also re added stimpacks to the lsit becuase i don't see why they needed to be removed from it * whetstone removed whetstone removed * price balances just tweaked the prices of the new bundles to make them actually worth purchasing following a 5 for the price of 4 standard * The final change finishes the requested changes * removes excessive line spacing * removes trailing comma --- code/game/objects/items/weapons/storage/boxes.dm | 10 ++++++++++ code/modules/mining/machine_vending.dm | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8345f3346c..ecad2dd215 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -184,6 +184,16 @@ for(var/i in 1 to 5) new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack(src) +/obj/item/weapon/storage/box/medipens/survival + name = "Survival pen bundle" + desc = "a box with several survival pens inside, welcome to immortality!!" + illustration = "syringe" + +/obj/item/weapon/storage/box/medipens/survival/New() + ..() + for(var/i in 1 to 5) + new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(src) + /obj/item/weapon/storage/box/beakers name = "box of beakers" illustration = "beaker" diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 3f5d284fcf..ea64e5b912 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -51,6 +51,10 @@ new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/device/mine_bot_ugprade/cooldown, 600), new /datum/data/mining_equipment("Drone AI Upgrade", /obj/item/slimepotion/sentience/mining, 1000), new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), + new /datum/data/mining_equipment("Survival Knife", /obj/item/weapon/kitchen/knife/combat/survival, 350), + new /datum/data/mining_equipment("Survival Pen Economy Pack",/obj/item/weapon/storage/box/medipens/survival, 2000), + new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 250), + new /datum/data/mining_equipment("Stimpack Economy Pack",/obj/item/weapon/storage/box/medipens/utility, 1000) ) /datum/data/mining_equipment From 376dd1f89a95b48f2a8cc7d779faaffb009a647e Mon Sep 17 00:00:00 2001 From: ktccd Date: Thu, 30 Mar 2017 04:57:45 +0200 Subject: [PATCH 3/3] Adds custom emotes to slimes (#320) Does not add the other human emotes, since they seem a bit odd to put in. Slimes needs custom emotes for... reasons. You all know why, don't make me say it in writing! >_< --- code/modules/mob/living/emote.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 48670ed9ea..9e8a461f72 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -376,6 +376,7 @@ key = "me" key_third_person = "custom" message = null + mob_type_blacklist_typecache = list(/mob/living/brain) /datum/emote/living/custom/proc/check_invalid(mob/user, input) . = TRUE