diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 10edcb49407..07c9715c9f8 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -35,7 +35,7 @@ obj/machinery/air_sensor
var/datum/gas_mixture/air_sample = return_air()
if(output&1)
- signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),)
+ signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1))
if(output&2)
signal.data["temperature"] = round(air_sample.temperature,0.1)
@@ -125,6 +125,8 @@ obj/machinery/computer/general_air_control
if(data)
if(data["pressure"])
sensor_part += " Pressure: [data["pressure"]] kPa
"
+ else
+ sensor_part += " Pressure: No pressure detected
"
if(data["temperature"])
sensor_part += " Temperature: [data["temperature"]] K
"
if(data["oxygen"]||data["toxins"]||data["nitrogen"]||data["carbon_dioxide"])
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 4b2d0c782ab..a34ce63eab4 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -9,7 +9,7 @@
var/mapping = 0//For the overview file, interesting bit of code.
check_eye(var/mob/user as mob)
- if ((get_dist(user, src) > 1 || !( user.canmove ) || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon)))
+ if ((get_dist(user, src) > 1 || user.blinded || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon)))
return null
var/list/viewing = viewers(src)
if((istype(user,/mob/living/silicon/robot)) && (!(viewing.Find(user))))
@@ -65,7 +65,7 @@
return 0
if(C)
- if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai)))
+ if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai)))
if(!C.can_use() && !isAI(user))
src.current = null
return 0
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 16a29af3098..08291eb0654 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -125,6 +125,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
desc = "There is something wrong if you're examining this."
/obj/item/device/uplink/hidden/Topic(href, href_list)
+ if(usr.stat || usr.restrained() || usr.paralysis || usr.stunned || usr.weakened)
+ return 0 // To stop people using their uplink when they shouldn't be able to
..()
if(href_list["lock"])
toggle()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index edf84e2cd08..8405a437334 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -571,6 +571,7 @@ obj/item/toy/cards
icon = 'icons/obj/toy.dmi'
icon_state = "deck_full"
w_class = 2.0
+ var/cooldown = 0
var/list/cards = list()
obj/item/toy/cards/New()
@@ -620,9 +621,11 @@ obj/item/toy/cards/attack_hand(mob/user as mob)
src.icon_state = "deck_low"
obj/item/toy/cards/attack_self(mob/user as mob)
- cards = shuffle(cards)
- playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
- user.visible_message("[user] shuffles the deck.", "You shuffle the deck.")
+ if(cooldown < world.time - 50)
+ cards = shuffle(cards)
+ playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
+ user.visible_message("[user] shuffles the deck.", "You shuffle the deck.")
+ cooldown = world.time
obj/item/toy/cards/attackby(obj/item/toy/singlecard/C, mob/living/user)
..()
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 2445db29315..038d9d88553 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -39,7 +39,7 @@
if(prefs.muted & MUTE_ADMINHELP)
src << "Error: Admin-PM: You are unable to use admin PM-s (muted)."
return
-
+
var/client/C
if(istext(whom))
C = directory[whom]
@@ -52,7 +52,7 @@
//get message text, limit it's length.and clean/escape html
if(!msg)
- msg = input(src,"Message:", "Private message to [C.key]") as text|null
+ msg = input(src,"Message:", "Private message to [key_name(C, 0, 0)]") as text|null
if(!msg) return
if(!C)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index f6da8c3b022..3da10575b65 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -700,6 +700,9 @@ note dizziness decrements automatically in the mob's Life() proc.
canmove = 0
if( istype(buckled,/obj/structure/stool/bed/chair) )
lying = 0
+ if( stat || weakened || paralysis || resting || sleeping || (status_flags & FAKEDEATH) )
+ drop_r_hand()
+ drop_l_hand()
else
lying = 1
else if( stat || weakened || paralysis || resting || sleeping || (status_flags & FAKEDEATH) )
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index be631c5d37a..2d252417e5a 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -63,7 +63,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/clothing/gloves/space_ninja/SNG = H.gloves
- if(!istype(SNG) || !SNG.candrain || !SNG.draining) return
+ if(!istype(SNG) || !SNG.candrain || SNG.draining) return
SNG.drain("CELL",src,H.wear_suit)
return