From 2582ef02b85e714a52fd58a934b5232beaf849ba Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:00:31 +0300 Subject: [PATCH 1/3] Namefix. --- code/modules/clothing/spacesuits/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index ba037f20cb..374f38be85 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -17,7 +17,7 @@ item_color = "skrell_helmet_black" /obj/item/clothing/suit/space/skrell - name = "Skrellian hardsuit" + name = "Skrellian voidsuit" desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) From 323cc56a89227743bf02e230d0168360f0488b66 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:01:06 +0300 Subject: [PATCH 2/3] Topic fix. --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2d6685d8b2..17dd5e4d79 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1031,10 +1031,10 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/Topic(href, href_list) - if(usr != src) - return if(..()) return + if(usr != src) + return if (href_list["showalerts"]) robot_alerts() From b1785edf33d954d855d1ca42ff1e5cc85108f0a6 Mon Sep 17 00:00:00 2001 From: Segrain Date: Thu, 11 Dec 2014 05:01:47 +0300 Subject: [PATCH 3/3] Fix for #7365. --- code/game/mecha/mech_fabricator.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index ba4493522f..e56dbe71e8 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -453,10 +453,10 @@ for(var/datum/design/D in files.known_designs) if(D.build_type&16) if(D.category in part_sets)//Checks if it's a valid category - if(add_part_to_set(D.category, text2path(D.build_path)))//Adds it to said category + if(add_part_to_set(D.category, D.build_path))//Adds it to said category i++ else - if(add_part_to_set("Misc", text2path(D.build_path)))//If in doubt, chunk it into the Misc + if(add_part_to_set("Misc", D.build_path))//If in doubt, chunk it into the Misc i++ return i