From 9b874877834af3c0fa3796135ead629bd5752e59 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Sat, 7 Mar 2015 23:13:00 -0500 Subject: [PATCH] Minor Fixes --- code/game/objects/structures/tables_racks.dm | 3 ++- code/modules/clothing/spacesuits/space_ninja.dm | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 61dbe8e5e5c..38a08c66b45 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -416,6 +416,7 @@ for(var/mob/O in viewers(user, 4)) O.show_message("\blue The [src] was sliced apart by [user]!", 1, "\red You hear [src] coming apart.", 2) destroy() + return if(!(W.flags & ABSTRACT)) if(user.drop_item()) @@ -427,7 +428,7 @@ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf) W.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2) W.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) - + return /obj/structure/table/proc/straight_table_check(var/direction) diff --git a/code/modules/clothing/spacesuits/space_ninja.dm b/code/modules/clothing/spacesuits/space_ninja.dm index 03ffac852a0..acc53c3dc40 100644 --- a/code/modules/clothing/spacesuits/space_ninja.dm +++ b/code/modules/clothing/spacesuits/space_ninja.dm @@ -100,7 +100,7 @@ suitBusy = 1 - if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started", "Confirm Shutdown", "Yes", "No") == "Yes")) + if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes")) usr << "Now de-initializing..." sleep(15) @@ -210,6 +210,7 @@ icon_state = (user.gender == MALE ? "s-ninjan" : "s-ninjanf") suitGloves.icon_state = "s-ninjan" + suitGloves.item_state = "s-ninjan" return 1 @@ -226,6 +227,7 @@ suitShoes.slowdown = -1 icon_state = "s-ninja" suitGloves.icon_state = "s-ninja" + suitGloves.item_state = "s-ninja" suitHood = null suitMask = null