From 953f36529255bac2077040108bb667faa51215cd Mon Sep 17 00:00:00 2001 From: sabiram Date: Fri, 12 Dec 2014 15:44:22 -0500 Subject: [PATCH 1/2] Adds 'me' hotkey again. Pedantic spelling changes. --- code/modules/reagents/reagent_containers/food/snacks/grown.dm | 2 +- interface/interface.dm | 1 + interface/skin.dmf | 4 ++++ maps/exodus-1.dmm | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 6e9bccbee95..238d0ae84b6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -313,7 +313,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/orange name = "orange" - desc = "It's an tangy fruit." + desc = "It's a tangy fruit." icon_state = "orange" potency = 20 filling_color = "#FAAD28" diff --git a/interface/interface.dm b/interface/interface.dm index 9cf97cfd98c..ab6a61d3d70 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -46,6 +46,7 @@ Hotkey-Mode: (hotkey-mode must be on) \te = equip \tr = throw \tt = say +\t5 = emote \tx = swap-hand (or y) \tz = activate held object \tf = cycle-intents-left diff --git a/interface/skin.dmf b/interface/skin.dmf index f8fc765e3e6..330d547944d 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -273,6 +273,10 @@ macro "hotkeymode" name = "CTRL+4" command = "a-intent hurt" is-disabled = false + elem + name = "5" + command = ".me" + is-disabled = false elem name = "A+REP" command = ".west" diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 52e647b71fe..6c4c6c70caf 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -3558,7 +3558,7 @@ "bqv" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/door_control{id = "bridge_electrical_maintenance"; name = "Maintenance Bolt Control"; normaldoorcontrol = 1; pixel_x = 24; pixel_y = 6; req_access_txt = "0"; req_one_access_txt = "19;57"; specialfunctions = 4},/obj/machinery/light_switch{pixel_x = 24; pixel_y = -6},/turf/simulated/floor,/area/maintenance/substation/command) "bqw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/maintenance/substation/command) "bqx" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 10},/turf/space,/area/space) -"bqy" = (/obj/machinery/door/poddoor{desc = "For use by authorized Nanotrasen AI Maintenance Technitians or in case of Emergancy Only."; id = "AI Door"; name = "AI Chamber Maintenance Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/turret_protected/ai) +"bqy" = (/obj/machinery/door/poddoor{desc = "For use by authorized NanoTrasen AI maintenance technicians or in case of emergency only."; id = "AI Door"; name = "AI Chamber Maintenance Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/turret_protected/ai) "bqz" = (/obj/structure/rack,/obj/item/weapon/tank/jetpack/oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/armor/captain,/obj/item/clothing/head/helmet/space/capspace,/obj/machinery/newscaster/security_unit{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bqA" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bqB" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Captain's Desk Door"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain) From 00a754caa7642632e8a550e8e3f120d0d0a33734 Mon Sep 17 00:00:00 2001 From: sabiram Date: Fri, 12 Dec 2014 15:57:37 -0500 Subject: [PATCH 2/2] Corrects hotkeys-help. --- interface/interface.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/interface.dm b/interface/interface.dm index ab6a61d3d70..e788afb7c17 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -47,8 +47,8 @@ Hotkey-Mode: (hotkey-mode must be on) \tr = throw \tt = say \t5 = emote -\tx = swap-hand (or y) -\tz = activate held object +\tx = swap-hand +\tz = activate held object (or y) \tf = cycle-intents-left \tg = cycle-intents-right \t1 = help-intent