From d2f591432fa4b1fa6d9f5041a018060c2b3b040e Mon Sep 17 00:00:00 2001
From: Jim Boonie <amnesstikk@gmail.com>
Date: Mon, 20 Jul 2015 15:22:52 +1200
Subject: [PATCH] Adds resist hotkeys for borgs and humans.

---
 html/changelogs/freerealestate - RESIST.yml |  6 +++
 interface/interface.dm                      |  5 +++
 interface/skin.dmf                          | 42 +++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 html/changelogs/freerealestate - RESIST.yml

diff --git a/html/changelogs/freerealestate - RESIST.yml b/html/changelogs/freerealestate - RESIST.yml
new file mode 100644
index 00000000000..f3dde428797
--- /dev/null
+++ b/html/changelogs/freerealestate - RESIST.yml	
@@ -0,0 +1,6 @@
+author: freerealestate
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added resist hotkeys for borgs and humans. With hotkeys mode, use CTRL+C or C as a human and CTRL+C, C or END as a borg. With hotkeys mode off, use CTRL+C as a human and END as a borg."
diff --git a/interface/interface.dm b/interface/interface.dm
index a24e86cd3aa..b46c3856ccb 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -91,6 +91,7 @@ Hotkey-Mode: (hotkey-mode must be on)
 \tm = me
 \tt = say
 \to = OOC
+\tc = resist
 \tx = swap-hand
 \tz = activate held object (or y)
 \tf = cycle-intents-left
@@ -110,6 +111,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+q = drop
 \tCtrl+e = equip
 \tCtrl+r = throw
+\tCtrl+c = resist
 \tCtrl+x = swap-hand
 \tCtrl+z = activate held object (or Ctrl+y)
 \tCtrl+f = cycle-intents-left
@@ -140,6 +142,7 @@ Hotkey-Mode: (hotkey-mode must be on)
 \tq = unequip active module
 \tt = say
 \tx = cycle active modules
+\tc = resist
 \tz = activate held object (or y)
 \tf = cycle-intents-left
 \tg = cycle-intents-right
@@ -157,6 +160,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+w = up
 \tCtrl+q = unequip active module
 \tCtrl+x = cycle active modules
+\tCtrl+c = resist
 \tCtrl+z = activate held object (or Ctrl+y)
 \tCtrl+f = cycle-intents-left
 \tCtrl+g = cycle-intents-right
@@ -166,6 +170,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+4 = toggle intents
 \tDEL = pull
 \tINS = toggle intents
+\tEND = resist
 \tPGUP = cycle active modules
 \tPGDN = activate held object
 </font>"}
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 68fafe4a6b0..c53f9e001cc 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -15,6 +15,10 @@ macro "borghotkeymode"
 		name = "SOUTHEAST"
 		command = ".southeast"
 		is-disabled = false
+	elem 
+		name = "SOUTHWEST"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "NORTHWEST"
 		command = "unequip-module"
@@ -99,6 +103,14 @@ macro "borghotkeymode"
 		name = "CTRL+A+REP"
 		command = ".west"
 		is-disabled = false
+	elem 
+		name = "C"
+		command = "resist"
+		is-disabled = false
+	elem 
+		name = "CTRL+C"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "D+REP"
 		command = ".east"
@@ -297,6 +309,10 @@ macro "macro"
 		name = "CTRL+A+REP"
 		command = ".west"
 		is-disabled = false
+	elem 
+		name = "CTRL+C"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "CTRL+D+REP"
 		command = ".east"
@@ -483,6 +499,14 @@ macro "hotkeymode"
 		name = "CTRL+A+REP"
 		command = ".west"
 		is-disabled = false
+	elem 
+		name = "C"
+		command = "resist"
+		is-disabled = false
+	elem 
+		name = "CTRL+C"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "D+REP"
 		command = ".east"
@@ -637,6 +661,10 @@ macro "borgmacro"
 		name = "SOUTHEAST"
 		command = ".southeast"
 		is-disabled = false
+	elem 
+		name = "SOUTHWEST"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "NORTHWEST"
 		command = "unequip-module"
@@ -701,6 +729,10 @@ macro "borgmacro"
 		name = "CTRL+A+REP"
 		command = ".west"
 		is-disabled = false
+	elem 
+		name = "CTRL+C"
+		command = "resist"
+		is-disabled = false
 	elem 
 		name = "CTRL+D+REP"
 		command = ".east"
@@ -1201,6 +1233,8 @@ window "chemdispenser"
 		keep-aspect = false
 		align = center
 		text-wrap = false
+		allow-html = false
+		letterbox = true
 	elem "eject"
 		type = BUTTON
 		pos = 264,4
@@ -1367,6 +1401,8 @@ window "chemdispenser"
 		keep-aspect = false
 		align = center
 		text-wrap = false
+		allow-html = false
+		letterbox = true
 	elem "child1"
 		type = CHILD
 		pos = 0,40
@@ -1488,6 +1524,8 @@ window "chemdispenser_reagents"
 		keep-aspect = false
 		align = center
 		text-wrap = false
+		allow-html = false
+		letterbox = true
 
 window "mainwindow"
 	elem "mainwindow"
@@ -1698,6 +1736,8 @@ window "mapwindow"
 		on-size = ""
 		icon-size = 0
 		text-mode = false
+		letterbox = true
+		zoom = 0
 		on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
 		on-hide = ".winset\"mainwindow.mainvsplit.left=\""
 		style = ""
@@ -2226,4 +2266,6 @@ window "infowindow"
 		on-show = ".winset\"rpane.infob.is-visible=true;rpane.browseb.is-visible=true?rpane.infob.pos=130,0:rpane.infob.pos=65,0 rpane.textb.is-visible=true rpane.infob.is-checked=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=infowindow\""
 		on-hide = ".winset\"rpane.infob.is-visible=false;rpane.browseb.is-visible=true?rpane.browseb.is-checked=true rpane.rpanewindow.left=browserwindow:rpane.textb.is-visible=true rpane.rpanewindow.pos=0,30 rpane.rpanewindow.size=0x0 rpane.rpanewindow.left=\""
 		on-tab = ""
+		prefix-color = none
+		suffix-color = none