diff --git a/baystation12.dme b/baystation12.dme
index 5e432fe41ca..f5dc8674529 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -80,7 +80,6 @@
 #define FILE_DIR "code/game/objects/stacks"
 #define FILE_DIR "code/game/objects/storage"
 #define FILE_DIR "code/game/objects/tanks"
-#define FILE_DIR "code/game/structure"
 #define FILE_DIR "code/game/verbs"
 #define FILE_DIR "code/js"
 #define FILE_DIR "code/modules"
@@ -724,7 +723,6 @@
 #include "code\game\objects\tanks\emergency.dm"
 #include "code\game\objects\tanks\jetpack.dm"
 #include "code\game\objects\tanks\oxygen.dm"
-#include "code\game\structure\structure.dm"
 #include "code\game\verbs\AI_status.dm"
 #include "code\game\verbs\checkkarma.dm"
 #include "code\game\verbs\ooc.dm"
diff --git a/code/WorkInProgress/Ported/Abi79/uplinks.dm b/code/WorkInProgress/Ported/Abi79/uplinks.dm
index 85ffa1f8914..82466134529 100644
--- a/code/WorkInProgress/Ported/Abi79/uplinks.dm
+++ b/code/WorkInProgress/Ported/Abi79/uplinks.dm
@@ -195,7 +195,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	explode()
 		var/obj/item/weapon/implant/uplink/U = src.loc
 		var/mob/living/A = U.imp_in
-		A.gib()
+		var/datum/organ/external/head = A:organs["head"]
+		head.take_damage(100, 0, 1)
 		..()
 
 
diff --git a/code/game/dna.dm b/code/game/dna.dm
index acb1d477f68..553c96c2236 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -482,6 +482,7 @@
 			I.implanted = O
 		O.flavor_text = M.flavor_text
 		O.warn_flavor_changed()
+		O.update_clothing()
 		del(M)
 		return
 //////////////////////////////////////////////////////////// Monkey Block
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 7de7e401344..b165fe74ce5 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -246,6 +246,7 @@ var/global/datum/controller/occupations/job_master
 		var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H)
 		H.equip_if_possible(BPK, H.slot_back,1)
 		H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack)
+		H.update_clothing()
 		return 1
 
 
diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index 44c9d1bd3a2..2bb197d7ce9 100755
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -369,6 +369,11 @@ mob/proc/flash_weak_pain()
 
 	if(istype(M, /mob/living/carbon/human))
 		M:attacked_by(src, user, def_zone)
+		var/mob/living/carbon/human/H = M
+		if(H)
+			H.UpdateDamageIcon()
+			H.update_clothing()
+		user.update_clothing()
 	else
 		switch(src.damtype)
 			if("brute")
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index c48b54bb2c4..b25c819d6cd 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -266,6 +266,7 @@ ZIPPO
 				else
 					user.r_hand = W
 				W.layer = 20
+				user.update_clothing()
 		else
 			return ..()
 		src.update_icon()
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 7468693ea32..0e3aa57dd81 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -87,6 +87,7 @@
 
 			spawn( 0 )
 				O.process()
+				user.update_clothing()
 				return
 		else
 			for(var/mob/O in viewers(M, null))
diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm
index 6d40b6aa56e..d8665dd7978 100644
--- a/code/game/objects/items/weapons/implants/implantfreedom.dm
+++ b/code/game/objects/items/weapons/implants/implantfreedom.dm
@@ -29,6 +29,7 @@
 					dropped(source)
 					if (W)
 						W.layer = initial(W.layer)
+				source.update_clothing()
 		return
 
 
diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm
index 89b5977b82b..62a2ff59579 100644
--- a/code/game/objects/stool.dm
+++ b/code/game/objects/stool.dm
@@ -69,6 +69,7 @@
 		if (M.buckled == src)
 			M.buckled = null
 			M.anchored = 0
+			M.update_clothing()
 
 /obj/structure/stool/proc/manual_unbuckle_all(mob/user as mob)
 	var/N = 0;
@@ -87,6 +88,7 @@
 //			world << "[M] is no longer buckled to [src]"
 			M.anchored = 0
 			M.buckled = null
+			M.update_clothing()
 			N++
 	return N
 
@@ -109,6 +111,7 @@
 	M.buckled = src
 	M.loc = src.loc
 	M.dir = src.dir
+	M.update_clothing()
 	src:buckled_mobs += M
 	src.add_fingerprint(user)
 	return
@@ -339,6 +342,7 @@
 				M.pixel_y = 0
 				M.anchored = 0
 				M.buckled = null
+				M.update_clothing()
 				N++
 		if(N)
 			density = 0
diff --git a/code/game/structure/structure.dm b/code/game/structure/structure.dm
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 7df3967af5d..7c97a22db91 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -85,7 +85,7 @@
 	handle_health_updates()
 
 	// Update clothing
-	update_clothing()
+//	update_clothing()
 
 	if(client)
 		handle_regular_hud_updates()
diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index 59c871e55bb..edf60ec1f95 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -474,6 +474,7 @@
 						usr << "\blue You successfully remove your handcuffs."
 						usr:handcuffed:loc = usr:loc
 						usr:handcuffed = null
+						usr.update_clothing()
 
 			if(istype(usr, /mob/living/carbon/human) && istype(usr:wear_suit, /obj/item/clothing/suit/straight_jacket) && usr:canmove && (usr.last_special <= world.time))
 				usr.next_move = world.time + 200