more changes

hyperstation/code/modules/cargo/sweatshop/sweatshop.dm

@@ -13,7 +13,7 @@
 	force = 8
 	sharpness = TRUE
 	w_class = WEIGHT_CLASS_HUGE
-	materials = list(MAT_METAL=50)
+	materials = list(/datum/material/iron=50)
 	attack_verb = list("slashed", "sawed")
 
 /obj/item/carpentry/hammer
@@ -24,7 +24,7 @@
 	force = 7
 	sharpness = FALSE
 	w_class = WEIGHT_CLASS_NORMAL
-	materials = list(MAT_METAL=100)
+	materials = list(/datum/material/iron=100)
 	attack_verb = list("bonked", "nailed")
 
 /obj/item/carpentry/glue
@@ -44,7 +44,7 @@
 	force = 3
 	sharpness = TRUE
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=25)
+	materials = list(/datum/material/iron=25)
 	attack_verb = list("bored", "drilled")
 
 /obj/item/carpentry/sandpaper
@@ -54,7 +54,7 @@
 	force = 1
 	sharpness = FALSE
 	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_GLASS=1) //lmao
+	materials = list(/datum/material/glass=1) //lmao
 	attack_verb = list("sanded", "licked")
 
 /obj/item/nails
@@ -65,7 +65,7 @@
 	force = 0
 	sharpness = TRUE
 	w_class = WEIGHT_CLASS_TINY
-	materials = list(MAT_METAL=10)
+	materials = list(/datum/material/iron=10)
 	attack_verb = list("nailed", "screwed")
 
 /obj/item/cushion

hyperstation/code/modules/clothing/sizeaccessories.dm

@@ -51,6 +51,8 @@
 
 //For glove slots
 /obj/item/clothing/gloves/ring/syntech/equipped(mob/living/user, slot)
+	. = ..()
+
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_target = user
 		if(slot ==ITEM_SLOT_GLOVES)
@@ -59,6 +61,7 @@
 				normalize_mob_size(human_target)
 
 /obj/item/clothing/gloves/ring/syntech/dropped(mob/living/user, slot)
+	. = ..()
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_target = user
 
@@ -87,6 +90,7 @@
 
 //For neck items
 /obj/item/clothing/neck/syntech/equipped(mob/living/user, slot)
+	. = ..()
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_target = user
 		if(slot ==ITEM_SLOT_NECK)
@@ -95,6 +99,7 @@
 				normalize_mob_size(human_target)
 
 /obj/item/clothing/neck/syntech/dropped(mob/living/user, slot)
+	. = ..()
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_target = user
 

hyperstation/code/modules/clothing/spacesuits/hardsuit.dm

@@ -38,7 +38,7 @@
 		return
 	if(!ishuman(user))
 		return
-	if(slot ==ITEM_SLOT_WEAR_SUIT)
+	if(slot == ITEM_SLOT_SUIT)
 		if(!firstpickup)
 			SEND_SOUND(user, sound('hyperstation/sound/halflife/hevsuit_pickup.ogg', volume = 50))
 		else

hyperstation/code/modules/resize/resizing.dm

@@ -1,32 +1,14 @@
 //I am not a coder. Please fucking tear apart my code, and insult me for how awful I am at coding. Please and thank you. -Dahlular
 //alright bet -BoxBoy
-#define RESIZE_MACRO 6
-#define RESIZE_HUGE 4
-#define RESIZE_BIG 2
-#define RESIZE_NORMAL 1
-#define RESIZE_SMALL 0.75
-#define RESIZE_TINY 0.50
-#define RESIZE_MICRO 0.25
-
 //Moving these here - Jay
 /mob/living
 	var/size_multiplier = 1 //multiplier for the mob's icon size atm
 	var/previous_size = 1
+	var/custom_body_size = 100
 
 //Cyanosis - Action that resizes the sprite for the client but nobody else. Say goodbye to attacking yourself when someone's above you lmao
 	var/datum/action/sizecode_resize/small_sprite
 
-#define MOVESPEED_ID_SIZE      "SIZECODE"
-#define MOVESPEED_ID_STOMP     "STEPPY"
-
-//averages
-#define RESIZE_A_MACROHUGE (RESIZE_MACRO + RESIZE_HUGE) / 2
-#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2
-#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2
-#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2
-#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2
-#define RESIZE_A_TINYMICRO (RESIZE_TINY + RESIZE_MICRO) / 2
-
 //Scale up a mob's icon by the size_multiplier
 /mob/living/update_transform()
 	ASSERT(!iscarbon(src)) //the source isnt carbon should always be true
@@ -142,7 +124,7 @@
 				now_pushing = 0
 				H.forceMove(tmob.loc)
 				sizediffStamLoss(tmob)
-				H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) //Full stop
+				H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/size, multiplicative_slowdown = 10) //Full stop
 				addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/, remove_movespeed_modifier), MOVESPEED_ID_STOMP), 3) //0.3 seconds
 				if(get_effective_size() > tmob.get_effective_size() && iscarbon(H))
 					if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
@@ -171,7 +153,7 @@
 				sizediffStamLoss(tmob)
 				sizediffBruteloss(tmob)
 				playsound(loc, 'sound/misc/splort.ogg', 50, 1)
-				H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10)
+				H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/size, multiplicative_slowdown = 10)
 				addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/, remove_movespeed_modifier), MOVESPEED_ID_STOMP), 10) //1 second
 				//H.Stun(20)
 				if(get_effective_size() > tmob.get_effective_size() && iscarbon(H))