diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 150ae28d..c98a7a90 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -892,7 +892,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
"
//Add the Hyper stuff below here
dat += "
Hyper Preferences
"
- dat += "NonCon:[noncon == TRUE ? "Enabled" : "Disabled"]
"
+ dat += "NonCon - Bottom:[noncon == TRUE ? "Enabled" : "Disabled"]
"
dat += "Hyper Special Roles
"
diff --git a/hyperstation/code/gamemode/traitor_lewd.dm b/hyperstation/code/gamemode/traitor_lewd.dm
index 72bc8fb2..02902c18 100644
--- a/hyperstation/code/gamemode/traitor_lewd.dm
+++ b/hyperstation/code/gamemode/traitor_lewd.dm
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(hyper_special_roles, list(
var/list/datum/mind/targets = list()
var/list/datum/mind/owners = get_owners()
for(var/datum/mind/candidate in SSticker.minds)
- if (!(candidate in owners) && ishuman(candidate.current))
+ if (!(candidate in owners) && ishuman(candidate.current) && (candidate.current.client == TRUE))
if(candidate.current.client.prefs.noncon == 1)
targets += candidate
if(targets.len > 0)
diff --git a/hyperstation/code/obj/rope.dm b/hyperstation/code/obj/rope.dm
index 98c933a2..fa762176 100644
--- a/hyperstation/code/obj/rope.dm
+++ b/hyperstation/code/obj/rope.dm
@@ -7,14 +7,14 @@
breakouttime = 10 //Easy to break out. It's not for gaming.
icon = 'hyperstation/icons/obj/rope.dmi'
icon_state = "rope"
- item_state = "rope_hands" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
+ item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
cuffsound = 'sound/weapons/cablecuff.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
var/mob/living/carbon/M = source
if(M.handcuffed)
- var/rope_message = pick("The rope is tightly tied onto you")
+ var/rope_message = pick("The rope is tightly tied onto you!")
to_chat(M, "[rope_message]")
M.min_arousal = 33
M.arousal_rate += 2
@@ -23,7 +23,7 @@
/mob/living/proc/rope_remove(list/sources, temp_min_arousal, temp_max_arousal, temp_arousal_rate) //Check to see it the rope is gone, and reset effects
var/mob/living/carbon/M = sources
if (!M.handcuffed)
- var/rope_message = pick("The rope has been removed")
+ var/rope_message = pick("The rope has been removed!")
to_chat(M, "[rope_message]")
M.min_arousal = temp_min_arousal
M.max_arousal = temp_max_arousal
@@ -52,4 +52,4 @@
result = /obj/item/restraints/handcuffs/rope
time = 40
reqs = list(/obj/item/stack/sheet/cloth = 5)
- category = CAT_MISC
\ No newline at end of file
+ category = CAT_MISC
diff --git a/hyperstation/icons/obj/rope.dmi b/hyperstation/icons/obj/rope.dmi
index 9937b8ea..22834cdb 100644
Binary files a/hyperstation/icons/obj/rope.dmi and b/hyperstation/icons/obj/rope.dmi differ
diff --git a/icons/mob/restraints.dmi b/icons/mob/restraints.dmi
index 5a44b749..5f50d629 100644
Binary files a/icons/mob/restraints.dmi and b/icons/mob/restraints.dmi differ