From 4bfb46037f28f290d68fec5057576a7443bd4a54 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 15 Jul 2014 09:18:37 -0400 Subject: [PATCH] Moar Object verb removal/switch to right-click --- code/WorkInProgress/computer3/laptop.dm | 4 ++-- code/game/dna/dna_modifier.dm | 4 ++-- code/game/machinery/Sleeper.dm | 6 +++--- code/game/machinery/computer/card.dm | 2 +- code/game/objects/items.dm | 4 ++-- code/game/objects/structures/crates_lockers/closets.dm | 2 +- code/game/objects/structures/crates_lockers/crates.dm | 2 +- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 2 +- code/game/objects/structures/window.dm | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index b88f782c2cd..c2286e26bfa 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -71,7 +71,7 @@ //Quickfix until Snapshot works out how he wants to redo power. ~Z /obj/item/device/laptop/verb/eject_id() - set category = "Object" + set category = null set name = "Eject ID Card" set src in oview(1) @@ -79,7 +79,7 @@ stored_computer.eject_id() /obj/machinery/computer3/laptop/verb/eject_id() - set category = "Object" + set category = null set name = "Eject ID Card" set src in oview(1) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 1d2c06a2043..a7a5c9dda20 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -73,7 +73,7 @@ /obj/machinery/dna_scannernew/verb/eject() set src in oview(1) - set category = "Object" + set category = null set name = "Eject DNA Scanner" if (usr.stat != 0) @@ -98,7 +98,7 @@ /obj/machinery/dna_scannernew/verb/move_inside() set src in oview(1) - set category = "Object" + set category = null set name = "Enter DNA Scanner" if (usr.stat != 0) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 73eed805b0d..4aee671b3c9 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -352,7 +352,7 @@ verb/eject() set name = "Eject Sleeper" - set category = "Object" + set category = null set src in oview(1) if(usr.stat != 0) return @@ -365,7 +365,7 @@ verb/remove_beaker() set name = "Remove Beaker" - set category = "Object" + set category = null set src in oview(1) if(usr.stat != 0) return @@ -443,7 +443,7 @@ /obj/machinery/sleeper/verb/move_inside() set name = "Enter Sleeper" - set category = "Object" + set category = null set src in oview(1) if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr))) return diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index f75296796c0..b168fff6a5c 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -31,7 +31,7 @@ return formatted /obj/machinery/computer/card/verb/eject_id() - set category = "Object" + set category = null set name = "Eject ID Card" set src in oview(1) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b607cc3da62..4b32a9ce464 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -99,7 +99,7 @@ /obj/item/verb/move_to_top() set name = "Move To Top" - set category = "Object" + set category = null set src in oview(1) if(!istype(src.loc, /turf) || usr.stat || usr.restrained() ) @@ -510,7 +510,7 @@ /obj/item/verb/verb_pickup() set src in oview(1) - set category = "Object" + set category = null set name = "Pick up" if(!(usr)) //BS12 EDIT diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 033d5df51d9..d6e142aa1ea 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -337,7 +337,7 @@ /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) - set category = "Object" + set category = null set name = "Toggle Open" if(!usr.canmove || usr.stat || usr.restrained()) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index d902bacd5bb..e1f53edc1e9 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -163,7 +163,7 @@ /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance - set category = "Object" + set category = null set name = "Toggle Lock" if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 35034d04e13..932319d5940 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -49,7 +49,7 @@ /obj/structure/stool/bed/chair/verb/rotate() set name = "Rotate Chair" - set category = "Object" + set category = null set src in oview(1) if(config.ghost_interaction) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 24e0b270eb9..eb57391286d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -262,7 +262,7 @@ /obj/structure/window/verb/rotate() set name = "Rotate Window Counter-Clockwise" - set category = "Object" + set category = null set src in oview(1) if(anchored) @@ -279,7 +279,7 @@ /obj/structure/window/verb/revrotate() set name = "Rotate Window Clockwise" - set category = "Object" + set category = null set src in oview(1) if(anchored)