diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 7425716cd9..8b3fe14134 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -247,6 +247,7 @@
mymob.internals.icon_state = "internal0"
mymob.internals.name = "internal"
mymob.internals.screen_loc = ui_internal
+ hud_elements |= mymob.internals
if(hud_data.has_warnings)
mymob.oxygen = new /obj/screen()
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index ff7821fa0a..40e04f0928 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -240,8 +240,6 @@ update_flag
nanomanager.update_uis(src) // Update all NanoUIs attached to src
-
-
/obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob)
return src.attack_hand(user)
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 586ef37525..615bf17359 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -83,7 +83,7 @@
/obj/machinery/portable_atmospherics/proc/update_connected_network()
if(!connected_port)
return
-
+
var/datum/pipe_network/network = connected_port.return_network(src)
if (network)
network.update = 1
@@ -120,7 +120,7 @@
user << "\blue Nothing happens."
return
- else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
+ else if ((istype(W, /obj/item/device/analyzer)) && Adjacent(user))
visible_message("\red [user] has used [W] on \icon[icon]")
if(air_contents)
var/pressure = air_contents.return_pressure()
@@ -153,25 +153,25 @@
if(cell)
user << "There is already a power cell installed."
return
-
+
var/obj/item/weapon/cell/C = I
-
+
user.drop_item()
C.add_fingerprint(user)
cell = C
C.loc = src
user.visible_message("\blue [user] opens the panel on [src] and inserts [C].", "\blue You open the panel on [src] and insert [C].")
return
-
+
if(istype(I, /obj/item/weapon/screwdriver))
if(!cell)
user << "\red There is no power cell installed."
return
-
+
user.visible_message("\blue [user] opens the panel on [src] and removes [cell].", "\blue You open the panel on [src] and remove [cell].")
cell.add_fingerprint(user)
cell.loc = src.loc
cell = null
return
-
+
..()
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 28192bde39..68ecbe0d87 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -31,6 +31,10 @@
if(1 to 4) overlays += "phoron-[phorontanks]"
if(5 to INFINITY) overlays += "phoron-5"
+/obj/structure/dispenser/attack_ai(mob/user as mob)
+ if(user.Adjacent(src))
+ return attack_hand(user)
+ ..()
/obj/structure/dispenser/attack_hand(mob/user as mob)
user.set_machine(src)
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index e38827b1a0..cbc9fb80a5 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -159,6 +159,7 @@
log_client_to_db()
send_resources()
+ nanomanager.send_resources(src)
if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 50806f0da2..30b3824fb4 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -88,7 +88,7 @@
//Pass the attack on to the target. This might delete/relocate wrapped.
target.attackby(wrapped,user)
- //If wrapped did neither get deleted nor put into target, put it back into the gripper.
+ //If wrapped was neither deleted nor put into target, put it back into the gripper.
if(wrapped && user && (wrapped.loc == user))
wrapped.loc = src
else
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2e60eed9fc..838f102ff9 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -862,6 +862,7 @@ var/list/robot_verbs_default = list(
return ..()
+
/mob/living/silicon/robot/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index f65d25d929..e06d1af938 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -266,6 +266,7 @@
return
+
/mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 4b9d28402c..45fb2cc107 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -45,4 +45,4 @@
client.eye = src
client.perspective = MOB_PERSPECTIVE
- nanomanager.send_resources(client)
+ nanomanager.send_resources(client)
\ No newline at end of file
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 37c7b5cf86..58460e1c6c 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -30,7 +30,7 @@ var/global/list/rad_collectors = list()
//so that we don't zero out the meter if the SM is processed first.
last_power = last_power_new
last_power_new = 0
-
+
if(P)
if(P.air_contents.gas["phoron"] == 0)
@@ -67,6 +67,7 @@ var/global/list/rad_collectors = list()
src.P = W
W.loc = src
update_icons()
+ return 1
else if(istype(W, /obj/item/weapon/crowbar))
if(P && !src.locked)
eject()
@@ -84,6 +85,7 @@ var/global/list/rad_collectors = list()
connect_to_network()
else
disconnect_from_network()
+ return 1
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
if(active)
@@ -94,10 +96,8 @@ var/global/list/rad_collectors = list()
user << "\red The controls can only be locked when the [src] is active"
else
user << "\red Access denied!"
- return 1
- else
- ..()
return 1
+ return ..()
/obj/machinery/power/rad_collector/examine()
..()
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index cfed4686cd..e64504cf51 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -14,7 +14,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
var/diamond_amount = 0
var/uranium_amount = 0
var/max_material_amount = 75000.0
-
+
use_power = 1
idle_power_usage = 30
active_power_usage = 2500
@@ -145,4 +145,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
else
new stacktype(src.loc, amount)
busy = 0
- src.updateUsrDialog()
\ No newline at end of file
+ src.updateUsrDialog()
+
+//This is to stop these machines being hackable via clicking.
+/obj/machinery/r_n_d/circuit_imprinter/attack_hand(mob/user as mob)
+ return
\ No newline at end of file
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 03544cb5fb..f23176de96 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -11,7 +11,7 @@ Note: Must be placed west/left of and R&D console to function.
name = "Protolathe"
icon_state = "protolathe"
flags = OPENCONTAINER
-
+
use_power = 1
idle_power_usage = 30
active_power_usage = 5000
@@ -171,4 +171,8 @@ Note: Must be placed west/left of and R&D console to function.
new stacktype(src.loc, amount)
busy = 0
src.updateUsrDialog()
+ return
+
+//This is to stop these machines being hackable via clicking.
+/obj/machinery/r_n_d/protolathe/attack_hand(mob/user as mob)
return
\ No newline at end of file
diff --git a/nano/templates/accounts_terminal.tmpl b/nano/templates/accounts_terminal.tmpl
index ca7fe82752..e70561c998 100644
--- a/nano/templates/accounts_terminal.tmpl
+++ b/nano/templates/accounts_terminal.tmpl
@@ -80,7 +80,7 @@
Balance:
- ${{:helper.formatNumber(money)}}
+ ${{:helper.formatNumber(data.money)}}