diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 05828ed7dd7..1274abff64c 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -217,6 +217,7 @@ log transactions
if("transfer")
if(authenticated_account)
var/transfer_amount = text2num(href_list["funds_amount"])
+ transfer_amount = round(transfer_amount, 0.01)
if(transfer_amount <= 0)
alert("That is not a valid amount.")
else if(transfer_amount <= authenticated_account.money)
@@ -302,6 +303,7 @@ log transactions
previous_account_number = tried_account_num
if("e_withdrawal")
var/amount = max(text2num(href_list["funds_amount"]),0)
+ amount = round(amount, 0.01)
if(amount <= 0)
alert("That is not a valid amount.")
else if(authenticated_account && amount > 0)
@@ -327,6 +329,7 @@ log transactions
usr << "\icon[src]You don't have enough funds to do that!"
if("withdrawal")
var/amount = max(text2num(href_list["funds_amount"]),0)
+ amount = round(amount, 0.01)
if(amount <= 0)
alert("That is not a valid amount.")
else if(authenticated_account && amount > 0)
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 0c13eb909f8..002f53d114d 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -67,15 +67,24 @@
/obj/item/weapon/spacecash/bundle/update_icon()
overlays.Cut()
var/sum = src.worth
+ var/num = 0
for(var/i in list(1000,500,200,100,50,20,10,1))
- while(sum >= i)
+ while(sum >= i && num < 50)
sum -= i
+ num++
var/image/banknote = image('icons/obj/items.dmi', "spacecash[i]")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
banknote.transform = M
src.overlays += banknote
+ if(num == 0) // Less than one thaler, let's just make it look like 1 for ease
+ var/image/banknote = image('icons/obj/items.dmi', "spacecash1")
+ var/matrix/M = matrix()
+ M.Translate(rand(-6, 6), rand(-4, 8))
+ M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
+ banknote.transform = M
+ src.overlays += banknote
src.desc = "They are worth [worth] Thalers."
/obj/item/weapon/spacecash/bundle/attack_self()
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 05ea07dd016..04fa4273a07 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -98,11 +98,8 @@
message = stars(message)
if(language)
- verb = language.speech_verb
style = language.colour
-
-
if(hard_to_hear)
message = stars(message)
diff --git a/nano/css/shared.css b/nano/css/shared.css
index 124eec62252..2f9c8b4045f 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -30,7 +30,7 @@ hr {
height: 1px;
}
-.link, .linkOn, .linkOff, .selected, .disabled {
+.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton {
float: left;
min-width: 15px;
height: 16px;
@@ -173,11 +173,11 @@ h4 {
font-weight: bold;
}
-.redBackground {
+.redButton {
background: #ea0000;
}
-.yellowBackground {
+.yellowButton {
background: #cacc00;
}
diff --git a/nano/templates/advanced_airlock_console.tmpl b/nano/templates/advanced_airlock_console.tmpl
index 1558f4a2a0c..e60cf7c9327 100644
--- a/nano/templates/advanced_airlock_console.tmpl
+++ b/nano/templates/advanced_airlock_console.tmpl
@@ -40,8 +40,8 @@
{{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}}
- {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
+ {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
@@ -55,6 +55,6 @@
- {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redBackground' : null)}}
+ {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/docking_airlock_console.tmpl b/nano/templates/docking_airlock_console.tmpl
index 9dd1709c69c..08d4dbf0e42 100644
--- a/nano/templates/docking_airlock_console.tmpl
+++ b/nano/templates/docking_airlock_console.tmpl
@@ -11,7 +11,7 @@
DOCKED-OVERRIDE ENABLED
{{/if}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else data.docking_status == "docking"}}
@@ -22,7 +22,7 @@
DOCKING-OVERRIDE ENABLED
{{/if}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else data.docking_status == "undocking"}}
@@ -33,7 +33,7 @@
UNDOCKING-OVERRIDE ENABLED
{{/if}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else data.docking_status == "undocked"}}
@@ -44,12 +44,12 @@
OVERRIDE ENABLED
{{/if}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else}}
ERROR
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{/if}}
@@ -78,19 +78,19 @@
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, 'disabled', null)}}
{{else}}
{{if data.interior_status.state == "open"}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redButton')}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}}
{{if data.exterior_status.state == "open"}}
- {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, null)}}
+ {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redButton')}}
{{else}}
- {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}}
+ {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}}
{{/if}}
- {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, (data.processing && !data.airlock_disabled) ? null : 'disabled', (data.processing && !data.airlock_disabled) ? null : null)}}
+ {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, (data.processing && !data.airlock_disabled) ? null : 'disabled', (data.processing && !data.airlock_disabled) ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/escape_pod_berth_console.tmpl b/nano/templates/escape_pod_berth_console.tmpl
index aedb46bb86a..434fa386cf1 100644
--- a/nano/templates/escape_pod_berth_console.tmpl
+++ b/nano/templates/escape_pod_berth_console.tmpl
@@ -28,10 +28,10 @@
{{if data.armed}}
{{if data.docking_status == "docked"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redButton' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : 'yellowButton')}}
{{/if}}
{{else}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, 'disabled', null)}}
diff --git a/nano/templates/escape_pod_console.tmpl b/nano/templates/escape_pod_console.tmpl
index 977c95ca42d..aa24d3a9cef 100644
--- a/nano/templates/escape_pod_console.tmpl
+++ b/nano/templates/escape_pod_console.tmpl
@@ -77,10 +77,10 @@
{{if data.docking_status == "docked"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redButton' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : 'yellowButton')}}
{{/if}}
@@ -88,8 +88,8 @@
- {{:helper.link('ARM', 'alert', {'command' : 'manual_arm'}, data.is_armed ? 'disabled' : null, data.is_armed ? 'redBackground' : 'yellowBackground')}}
- {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'force_launch'}, data.can_force ? null : 'disabled', data.can_force ? 'yellowBackground' : null)}}
+ {{:helper.link('ARM', 'alert', {'command' : 'manual_arm'}, data.is_armed ? 'disabled' : null, data.is_armed ? 'redButton' : 'yellowButton')}}
+ {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'force_launch'}, data.can_force ? null : 'disabled', data.can_force ? 'yellowButton' : null)}}
diff --git a/nano/templates/escape_shuttle_control_console.tmpl b/nano/templates/escape_shuttle_control_console.tmpl
index 8fdb6b4cc5b..f3331313ad0 100644
--- a/nano/templates/escape_shuttle_control_console.tmpl
+++ b/nano/templates/escape_shuttle_control_console.tmpl
@@ -78,7 +78,7 @@
{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch ? null : 'disabled' , null)}}
{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}}
- {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , data.can_force ? 'redBackground' : null)}}
+ {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , data.can_force ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/shuttle_control_console.tmpl b/nano/templates/shuttle_control_console.tmpl
index efd0a00b63d..ccc4df70aaf 100644
--- a/nano/templates/shuttle_control_console.tmpl
+++ b/nano/templates/shuttle_control_console.tmpl
@@ -60,7 +60,7 @@
{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch? null : 'disabled' , null)}}
{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}}
- {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force? null : 'disabled' , data.can_force ? 'redBackground' : null)}}
+ {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force? null : 'disabled' , data.can_force ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/shuttle_control_console_exploration.tmpl b/nano/templates/shuttle_control_console_exploration.tmpl
index b220a44fda8..fe765246d25 100644
--- a/nano/templates/shuttle_control_console_exploration.tmpl
+++ b/nano/templates/shuttle_control_console_exploration.tmpl
@@ -67,7 +67,7 @@
{{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch ? null : 'disabled' , null)}}
{{:helper.link('Cancel Launch', 'cancel', {'cancel' : '1'}, data.can_cancel ? null : 'disabled' , null)}}
- {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , data.can_force ? 'redBackground' : null)}}
+ {{:helper.link('Force Launch', 'alert', {'force' : '1'}, data.can_force ? null : 'disabled' , data.can_force ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/simple_airlock_console.tmpl b/nano/templates/simple_airlock_console.tmpl
index 714c9398006..ca49b20f6ae 100644
--- a/nano/templates/simple_airlock_console.tmpl
+++ b/nano/templates/simple_airlock_console.tmpl
@@ -19,18 +19,18 @@
{{if data.interior_status.state == "open"}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redButton')}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}}
{{if data.exterior_status.state == "open"}}
- {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, null)}}
+ {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redButton')}}
{{else}}
- {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}}
+ {{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowButton' : null)}}
{{/if}}
- {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? null : null)}}
+ {{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redButton' : null)}}
\ No newline at end of file
diff --git a/nano/templates/simple_docking_console.tmpl b/nano/templates/simple_docking_console.tmpl
index 89d76849964..73c8ff8e3e1 100644
--- a/nano/templates/simple_docking_console.tmpl
+++ b/nano/templates/simple_docking_console.tmpl
@@ -89,10 +89,10 @@
{{if data.docking_status == "docked"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redButton' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : 'yellowButton')}}
{{/if}}
diff --git a/nano/templates/simple_docking_console_pod.tmpl b/nano/templates/simple_docking_console_pod.tmpl
index 3e9331ee700..07f055ea2cc 100644
--- a/nano/templates/simple_docking_console_pod.tmpl
+++ b/nano/templates/simple_docking_console_pod.tmpl
@@ -89,12 +89,12 @@
{{if data.docking_status == "docked"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : null)}}
{{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, 'disabled', null)}}
{{else}}
- {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redBackground' : null)}}
- {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : 'yellowBackground')}}
- {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, data.can_force ? null : 'disabled', data.can_force ? 'redBackground' : null)}}
+ {{:helper.link('Force exterior door', 'alert', {'command' : 'force_door'}, data.override_enabled ? null : 'disabled', data.override_enabled ? 'redButton' : null)}}
+ {{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redButton' : 'yellowButton')}}
+ {{:helper.link('MANUAL EJECT', 'alert', {'command' : 'toggle_override'}, data.can_force ? null : 'disabled', data.can_force ? 'redButton' : null)}}
{{/if}}