diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
index 669048cbf40..610186a7b7d 100644
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -12,13 +12,6 @@
/turf/simulated/floor/airless/ceiling
icon_state = "rockvault"
-/turf/simulated/floor/airless/catwalk
- name = "catwalk"
- icon = 'icons/turf/catwalks.dmi'
- icon_state = "catwalk0"
- floor_type = null
- intact = 0
-
/turf/simulated/floor/light
name = "Light floor"
luminosity = 5
@@ -33,8 +26,6 @@
update_icon()
name = n
-
-
/turf/simulated/floor/wood
name = "floor"
icon_state = "wood"
@@ -225,10 +216,4 @@
icon_state = "snow"
/turf/simulated/floor/plating/snow/ex_act(severity)
- return
-
-/turf/simulated/floor/plating/airless/catwalk
- icon = 'icons/turf/catwalks.dmi'
- icon_state = "Floor3"
- name = "catwalk"
- desc = "Cats really don't like these things."
\ No newline at end of file
+ return
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 1c10aa36ac5..b3e8ea68167 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -595,6 +595,8 @@
H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly."
use_obj.canremove = 1
holder.drop_from_inventory(use_obj)
+ use_obj.loc = get_turf(src)
+ use_obj.dropped()
use_obj.canremove = 0
use_obj.loc = src
@@ -648,10 +650,10 @@
for(var/piece in list("helmet","gauntlets","chest","boots"))
toggle_piece(piece, H, ONLY_DEPLOY)
-/obj/item/weapon/rig/dropped()
+/obj/item/weapon/rig/dropped(var/mob/user)
..()
for(var/piece in list("helmet","gauntlets","chest","boots"))
- toggle_piece(piece, wearer, ONLY_RETRACT)
+ toggle_piece(piece, user, ONLY_RETRACT)
wearer = null
//Todo
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index d3b354fe521..535ab47f813 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -70,27 +70,25 @@
check_limb_support()
..()
-/obj/item/clothing/suit/space/dropped()
- check_limb_support()
+/obj/item/clothing/suit/space/dropped(var/mob/user)
+ check_limb_support(user)
..()
// Some space suits are equipped with reactive membranes that support
// broken limbs - at the time of writing, only the ninja suit, but
// I can see it being useful for other suits as we expand them. ~ Z
// The actual splinting occurs in /datum/organ/external/proc/fracture()
-/obj/item/clothing/suit/space/proc/check_limb_support()
+/obj/item/clothing/suit/space/proc/check_limb_support(var/mob/living/carbon/human/user)
// If this isn't set, then we don't need to care.
if(!supporting_limbs || !supporting_limbs.len)
return
- var/mob/living/carbon/human/H = src.loc
-
- // If the holder isn't human, or the holder IS and is wearing the suit, it keeps supporting the limbs.
- if(!istype(H) || H.wear_suit == src)
+ if(!istype(user) || user.wear_suit == src)
return
// Otherwise, remove the splints.
for(var/datum/organ/external/E in supporting_limbs)
E.status &= ~ ORGAN_SPLINTED
+ user << "The suit stops supporting your [E.display_name]."
supporting_limbs = list()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 95d8ed9d57f..0eedb1d9b47 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -167,7 +167,7 @@
src.sight &= ~SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 8
- src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ src.see_invisible = SEE_INVISIBLE_MINIMUM
regular_hud_updates()
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index cc14488a5fc..90ac0c091b2 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -1,29 +1,29 @@
client/script = {"