more work

GainStation13/code/clothing/calorite_collar.dm

@@ -9,10 +9,10 @@
 	if(!weight_gain_rate_modifier)
 		return FALSE
 
-	if(!iscarbon(wearer) || slot != SLOT_NECK || !wearer?.client?.prefs?.weight_gain_items)
+	if(!iscarbon(wearer) || slot !=ITEM_SLOT_NECK || !wearer?.client?.prefs?.weight_gain_items)
 		return FALSE
-		
-	wearer.weight_gain_rate = wearer.weight_gain_rate * weight_gain_rate_modifier	
+
+	wearer.weight_gain_rate = wearer.weight_gain_rate * weight_gain_rate_modifier
 
 /obj/item/clothing/neck/dropped(mob/user)
 	. = ..()
@@ -22,7 +22,7 @@
 
 	if(!iscarbon(wearer) || !(wearer.get_item_by_slot(SLOT_NECK) == src) || !wearer?.client?.prefs?.weight_gain_items)
 		return FALSE
-		
+
 	wearer.weight_gain_rate = (wearer.weight_gain_rate / weight_gain_rate_modifier)
 
 

GainStation13/code/clothing/fat_mask.dm

@@ -8,7 +8,7 @@
 
 /obj/item/clothing/mask/gas/fattening/equipped(mob/M, slot)
 	. = ..()
-	if (slot == SLOT_WEAR_MASK)
+	if (slot ==ITEM_SLOT_WEAR_MASK)
 		if(iscarbon(M))
 			C = M
 			START_PROCESSING(SSobj, src)

GainStation13/code/clothing/haydee_suit.dm

@@ -8,7 +8,7 @@
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25)
 	item_color = "white"
 	slowdown = 0
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	actions_types = list()
 
 /obj/item/clothing/suit/space/hardsuit/engine/haydee
@@ -23,7 +23,7 @@
 	actions_types = list(/datum/action/item_action/toggle_helmet)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/haydee
 	slowdown = 0
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 	var/icon_location = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
 	var/mob/living/carbon/U
 

GainStation13/code/clothing/head.dm

@@ -4,25 +4,22 @@
 	name = "GATO Hardsuit Helmet"
 	desc = "Exclusive version of a hardsuit helmet, usually reserved for GATO CC personnel."
 	icon = 'GainStation13/icons/mob/head.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
 	icon_state = "hardsuit0-gato"
 	item_state = "hardsuit0-gato"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/HoS/beret/gato
 	name = "GT-CC Beret"
 	desc = "A robust beret for the CC personnel, for looking stylish while not sacrificing protection."
 	icon = 'GainStation13/icons/mob/head.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
 	icon_state = "gato_beret"
 	item_state = "gato_beret"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/head/HoS/gato
 	name = "GT-CC Cap"
 	desc = "The robust standard-issue cap of the CC personnel."
 	icon = 'GainStation13/icons/mob/head.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/head.dmi'
 	icon_state = "gato_cap"
 	item_state = "gato_cap"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE

GainStation13/code/clothing/suits.dm

@@ -8,7 +8,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "letterman_gato"
 	item_state = "letterman_gato"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/capcarapace/cc
 	name = "Elegant Carapace"
@@ -17,7 +17,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "cc_carapace"
 	item_state = "cc_carapace"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/capcarapace/gato
 	name = "CC-GT Carapace"
@@ -26,7 +26,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "gato_carapace"
 	item_state = "gato_carapace"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/capcarapace/moka
 	name = "Hellcat Overcoat"
@@ -35,7 +35,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "hellcat_overcoat"
 	item_state = "hellcat_overcoat"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/capcarapace/paradeblack
 	name = "CC Parade Jacket"
@@ -44,7 +44,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "paradejacket_black"
 	item_state = "paradejacket_black"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/armor/vest/capcarapace/paradepurple
 	name = "CC Parade Jacket"
@@ -53,7 +53,7 @@
 	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "paradejacket_purple"
 	item_state = "paradejacket_purple"
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/space/hardsuit/ert/alert/gato
 	name = "GATO Hardsuit"
@@ -63,4 +63,4 @@
 	icon_state = "gato_hardsuit"
 	item_state = "gato_hardsuit"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert/gato
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE

GainStation13/code/game/objects/items/RCD.dm

@@ -15,7 +15,6 @@
 	prereq_ids = list("adv_engi", "adv_bluespace")
 	design_ids = list("arcd_design")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7000)
-	export_price = 7000
 
 /obj/item/borg/upgrade/arcd
 	name = "cyborg ARCD"

GainStation13/code/mechanics/fatrousal.dm

@@ -4,7 +4,6 @@
 	value = 0 //ERP quirk
 	gain_text = "<span class='notice'>Your body feels like it could grow at any moment.</span>"
 	lose_text = "<span class='notice'>The feeling of impending growth is gone...</span>"
-	category = CATEGORY_SEXUAL
 	mob_trait = TRAIT_FATROUSAL
 
 /datum/quirk/fatrousal/add()
@@ -23,7 +22,7 @@
 		return C.getArousalLoss()*35
 	return FALSE
 
-///mob/living/adjustArousalLoss(amount, updating_arousal=1)
+///mob/living/adjust_arousal(amount, updating_arousal=1)
 //	if(HAS_TRAIT(src, TRAIT_FATROUSAL))
 //		amount = amount * 0.2
 //	..()

GainStation13/code/mechanics/helplessness.dm

@@ -5,15 +5,15 @@
 	return ..()
 
 /datum/species/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self)
-	if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot == SLOT_BACK)
+	if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot ==ITEM_SLOT_BACK)
 		to_chat(H, "<span class='warning'>You are too fat to wear anything on your back.</span>")
 		return FALSE
 
-	if(!istype(I, /obj/item/clothing/under/color/grey/modular) && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == SLOT_W_UNIFORM)
+	if(!istype(I, /obj/item/clothing/under/color/grey/modular) && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot ==ITEM_SLOT_W_UNIFORM)
 		to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
 		return FALSE
 
-	if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == SLOT_SHOES || slot == SLOT_GLOVES || slot == SLOT_WEAR_SUIT))
+	if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot ==ITEM_SLOT_SHOES || slot ==ITEM_SLOT_GLOVES || slot ==ITEM_SLOT_WEAR_SUIT))
 		to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
 		return FALSE
 

GainStation13/code/mechanics/infestation.dm

@@ -7,32 +7,32 @@
 	min_players = 6
 
 /datum/round_event/dessert_infestation
-	announceWhen = 100
-	var/static/list/dessert_station_areas_blacklist = typecacheof(/area/space, 
+	announce_when = 100
+	var/static/list/dessert_station_areas_blacklist = typecacheof(/area/space,
 	/area/shuttle,
-	/area/mine, 
-	/area/holodeck, 
-	/area/ruin, 
-	/area/hallway, 
-	/area/hallway/primary, 
-	/area/hallway/secondary, 
+	/area/mine,
+	/area/holodeck,
+	/area/ruin,
+	/area/hallway,
+	/area/hallway/primary,
+	/area/hallway/secondary,
 	/area/hallway/secondary/entry,
-	/area/engine/supermatter, 
-	/area/engine/atmospherics_engine, 
-	/area/engine/engineering/reactor_core, 
-	/area/engine/engineering/reactor_control, 
+	/area/engine/supermatter,
+	/area/engine/atmospherics_engine,
+	/area/engine/engineering/reactor_core,
+	/area/engine/engineering/reactor_control,
 	/area/ai_monitored/turret_protected,
-	/area/layenia/cloudlayer, 
-	/area/asteroid/nearstation, 
-	/area/science/server, 
-	/area/science/explab, 
+	/area/layenia/cloudlayer,
+	/area/asteroid/nearstation,
+	/area/science/server,
+	/area/science/explab,
 	/area/science/xenobiology,
 	/area/security/processing)
 	var/spawncount = 1
 	fakeable = FALSE
 
 /datum/round_event/dessert_infestation/setup()
-	announceWhen = rand(announceWhen, announceWhen + 50)
+	announce_when = rand(announce_when, announce_when + 50)
 	spawncount = rand(4, 7)
 
 /datum/round_event/dessert_infestation/announce(fake)
@@ -67,11 +67,6 @@
 		pickedArea = pick_n_take(eligible_areas)
 		var/list/turf/t = get_area_turfs(pickedArea, SSmapping.station_start)
 		for(var/turf/thisTurf in t) // now we check if it's a closed turf, cold turf or occupied turf and yeet it
-			if(isopenturf(thisTurf))
-				var/turf/open/tempGet = thisTurf
-				if(tempGet.air.temperature <= T0C)
-					t -= thisTurf
-					continue
 			if(isclosedturf(thisTurf))
 				t -= thisTurf
 			else

GainStation13/code/mechanics/metal_cruncher.dm

@@ -4,7 +4,6 @@
 	value = 0 //ERP quirk
 	gain_text = "<span class='notice'>You feel like you could eat steel.</span>"
 	lose_text = "<span class='notice'>Your teeth hurt too much...</span>"
-	category = CATEGORY_FOOD
 	mob_trait = TRAIT_METAL_CRUNCHER
 
 /obj/item/stack

GainStation13/code/mechanics/water_sponge.dm

@@ -4,7 +4,6 @@
 	value = 0 //ERP quirk
 	gain_text = "<span class='notice'>You feel absorbant.</span>"
 	lose_text = "<span class='notice'>You don't feel absorbant anymore.</span>"
-	category = CATEGORY_FOOD
 	mob_trait = TRAIT_WATER_SPONGE
 
 /datum/reagent/water/on_mob_add(mob/living/L, amount)
@@ -28,7 +27,7 @@
 			M.reagents.add_reagent(/datum/reagent/water, reac_volume/2)
 		if(method == VAPOR)
 			M.reagents.add_reagent(/datum/reagent/water, reac_volume/3)
-	
+
 
 /datum/reagent/water/proc/fat_hide(mob/living/carbon/user)
 	return volume * 3.5
@@ -67,7 +66,7 @@
 		add_fingerprint(usr)
 		attached = target
 		START_PROCESSING(SSobj, src)
-	
+
 /obj/structure/sink/process()
 	if(!(get_dist(src, attached) <= 1 && isturf(attached.loc)))
 		to_chat(attached, "<span class='userdanger'>[attached] is ripped from the sink!</span>") // GS13
@@ -78,7 +77,7 @@
 		attached.reagents.add_reagent(/datum/reagent/water, 5)
 	else
 		return PROCESS_KILL
-	
+
 /obj/structure/sink/attack_hand(mob/living/user)
 	if(attached)
 		visible_message("[attached] is detached from [src]")

GainStation13/code/mechanics/web_weaving.dm

@@ -4,7 +4,6 @@
 	value = 0 //ERP quirk
 	gain_text = "<span class='notice'>You find yourself able to weave webs.</span>"
 	lose_text = "<span class='notice'>You are no longer able to weave webs.</span>"
-	category = CATEGORY_SEXUAL
 	mob_trait = TRAIT_WEB_WEAVER
 	///What action is linked with this quirk?
 	var/datum/action/innate/wrap_target/linked_action1
@@ -20,7 +19,7 @@
 	linked_action1.Remove(quirk_holder)
 	linked_action2.Remove(quirk_holder)
 	return ..()
-	
+
 /datum/action/innate/wrap_target
 	name = "wrap"
 	desc = "encases a humanoid in a web cocoon."
@@ -32,14 +31,14 @@
 	var/mob/living/carbon/user = owner
 	if(!user || !ishuman(user))
 		return FALSE
-	
+
 	var/mob/living/carbon/human/target = user.pulling
 	if(!target || !ishuman(target) || user.grab_state < GRAB_AGGRESSIVE) //Add a check for a bondage pref whenever that gets added in.
 		to_chat(user, "<span class='warning'>You need to aggressively grab a humanoid to use this.</span>")
 		return FALSE
 
 	if(target.wear_suit)
-		var/obj/item/clothing/suit = target.wear_suit 
+		var/obj/item/clothing/suit = target.wear_suit
 		if(istype(suit, /obj/item/clothing/suit/straight_jacket/web))
 			user.visible_message("<span class='warning'>[user] begins to fully encase [target] in a cocoon!</span>", "<span class='warning'>You begin to fully encase [target] in a cocoon.</span>")
 			if(!do_after_mob(user, target, 30 SECONDS))
@@ -58,7 +57,7 @@
 			new_matrix.Translate(0,16 * (cocoon_size-1))
 			spawned_cocoon.transform = new_matrix
 
-			return TRUE 
+			return TRUE
 
 		user.visible_message("<span class='warning'>[user] attempts to remove [target]'s [target.wear_suit]!</span>", "<span class='warning'>You attempt to remove [target]'s [target.wear_suit].</span>")
 		if(!do_after_mob(user, target, 10 SECONDS) || !target.dropItemToGround(suit))
@@ -69,7 +68,7 @@
 		return FALSE
 
 	user.visible_message("<span class='warning'>[user] attempts to wrap [target] inside of [wrapping]!</span>", "<span class='warning'>You attempt to wrap [target] inside of [wrapping].</span>")
-	if(!do_after_mob(user, target, 20 SECONDS) || !target.equip_to_slot_if_possible(wrapping, SLOT_WEAR_SUIT, TRUE, TRUE))
+	if(!do_after_mob(user, target, 20 SECONDS) || !target.equip_to_slot_if_possible(wrapping,ITEM_SLOT_WEAR_SUIT, TRUE, TRUE))
 		user.visible_message("<span class='warning'>[user] fails to wrap [target] inside of [wrapping]!</span>", "<span class='warning'>You fail to wrap [target] inside of [wrapping].</span>")
 		return FALSE
 
@@ -86,10 +85,10 @@
 	breakouttime = 600 //1 minute is reasonable.
 	equip_delay_other = 0
 	equip_delay_self = 0
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	mutantrace_variation = NONE
 
 /obj/item/clothing/suit/straight_jacket/web/equipped(mob/user, slot)
-	. = ..()	
+	. = ..()
 	if((user.get_item_by_slot(SLOT_WEAR_SUIT)) != src && !QDELETED(src))
 		qdel(src)
 

GainStation13/code/mobs/emote.dm

@@ -0,0 +1,2 @@
+/datum/emote/proc/get_sound(mob/living/user)
+	return sound //by default just return this var.

GainStation13/code/modules/food_and_drinks/food.dm

@@ -6,13 +6,13 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/flatulose = 4, /datum/reagent/consumable/sodiumchloride = 0.5)
 	filling_color = "#74291b"
 	tastes = list("refried beans","grease" = 1)
-	foodtype = MEAT 
+	foodtype = MEAT
 	price = 3
 
 //these have been ported from CHOMPstation / Virgo
 /obj/item/reagent_containers/food/snacks/doner_kebab
 	name = "doner kebab"
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie."
 	icon_state = "doner_kebab"
 	trash = null
@@ -24,7 +24,7 @@
 /obj/item/reagent_containers/food/snacks/lasagna
 	name = "lasagna"
 	desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "lasagna"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 10)
 	filling_color = "#872020"
@@ -34,7 +34,7 @@
 /obj/item/reagent_containers/food/snacks/corndog
 	name = "corn dog"
 	desc = "A cornbread covered sausage deepfried in oil."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "corndog"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#df9745"
@@ -44,7 +44,7 @@
 /obj/item/reagent_containers/food/snacks/turkey
 	name = "turkey"
 	desc = "Tastes like chicken. It can be sliced!"
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "turkey"
 	slice_path = /obj/item/reagent_containers/food/snacks/turkey_leg
 	slices_num = 4
@@ -56,61 +56,61 @@
 /obj/item/reagent_containers/food/snacks/turkey_leg
 	name = "turkey leg"
 	desc = "Tastes like chicken."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "turkey_slice"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#ae6941"
 	tastes = list("turkey" = 1)
-	foodtype = MEAT 
+	foodtype = MEAT
 
 /obj/item/reagent_containers/food/snacks/brownies
 	name = "brownies"
 	desc = "Halfway to fudge, or halfway to cake? Who cares!"
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "brownies"
 	slice_path = /obj/item/reagent_containers/food/snacks/brownies_slice
 	slices_num = 6
 	list_reagents = list(/datum/reagent/consumable/nutriment = 30)
 	filling_color = "#392f27"
 	tastes = list("chocolate" = 1)
-	foodtype = GRAIN | SUGAR | DAIRY 
+	foodtype = GRAIN | SUGAR | DAIRY
 
 /obj/item/reagent_containers/food/snacks/brownies_slice
 	name = "brownie"
 	desc = "a dense, decadent chocolate brownie."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "browniesslice"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#392f27"
 	tastes = list("chocolate" = 1)
-	foodtype = GRAIN | SUGAR | DAIRY 
+	foodtype = GRAIN | SUGAR | DAIRY
 
 /obj/item/reagent_containers/food/snacks/brownies_cosmic
 	name = "cosmic brownies"
 	desc = "The power of cosmos likes within your hand."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "cosmicbrownies"
 	slice_path = /obj/item/reagent_containers/food/snacks/brownies_slice_cosmic
 	slices_num = 6
 	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/medicine/omnizine = 5)
 	filling_color = "#392f27"
 	tastes = list("chocolate" = 1)
-	foodtype = GRAIN | SUGAR | DAIRY 
+	foodtype = GRAIN | SUGAR | DAIRY
 
 /obj/item/reagent_containers/food/snacks/brownies_slice_cosmic
 	name = "cosmic brownie"
 	desc = "a dense, decadent and fun-looking chocolate brownie."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "cosmicbrownieslice"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/omnizine = 1)
 	filling_color = "#392f27"
 	tastes = list("chocolate" = 1)
-	foodtype = GRAIN | SUGAR | DAIRY 
+	foodtype = GRAIN | SUGAR | DAIRY
 
 /obj/item/reagent_containers/food/snacks/bacon_and_eggs
 	name = "bacon and eggs"
 	desc = "A staple of every breakfast."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "bacon_and_eggs"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 8)
 	filling_color = "#e9e6e3"
@@ -120,7 +120,7 @@
 /obj/item/reagent_containers/food/snacks/eggmuffin
 	name = "egg muffin"
 	desc = "A staple of every breakfast."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "eggmuffin"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 8)
 	filling_color = "#e9e6e3"
@@ -130,7 +130,7 @@
 /obj/item/reagent_containers/food/snacks/cinammonbun
 	name = "cinammon bun"
 	desc = "Careful not to have it stolen."
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	icon_state = "cinammonbun"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#e9e6e3"

GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm

@@ -9,7 +9,7 @@
 /obj/item/reagent_containers/food/snacks/pizza/framewrecker
 	name = "Framewrecker Pizza"
 	desc = "You feel your arteries clogging just by merely looking at this monster. Is this even real, or a mere hallucination?"
-	icon = 'icons/obj/food/food64x64.dmi'
+	icon = 'GainStation13/icons/obj/food/food64x64.dmi'
 	icon_state = "theonepizza"
 	pixel_x = -16
 	pixel_y = -16
@@ -32,7 +32,7 @@
 /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker
 	name = "Framewrecker Pizza Slice"
 	desc = "This mere slice is the size of pizza on its own!"
-	icon = 'icons/obj/food/ported_meals.dmi'
+	icon = 'GainStation13/icons/obj/food/ported_meals.dmi'
 	list_reagents = list(/datum/reagent/consumable/nutriment = 60)
 	icon_state = "big_mushroom_slice"
 	filling_color = "#FFA500"

GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm

@@ -87,11 +87,11 @@
 
 /datum/reagent/consumable/caloriteblessing/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_GOTTAGOFAST, type)
+	L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
 
 
 /datum/reagent/consumable/caloriteblessing/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_GOTTAGOFAST, type)
+	L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
 	..()
 
 

GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm

@@ -11,7 +11,6 @@
 	glass_name = "belly bloats"
 	glass_desc = "The perfect mix to be big and merry with."
 	shot_glass_icon_state = "shotglassbrown"
-	hydration = 3
 
 /datum/reagent/consumable/ethanol/belly_bloats/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -31,7 +30,6 @@
 	glass_name = "blobby mary"
 	glass_desc = "For the morbidly obese ladies and gentlemen."
 	shot_glass_icon_state = "shotglassred"
-	hydration = 4
 
 /datum/reagent/consumable/ethanol/blobby_mary/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -51,7 +49,6 @@
 	glass_name = "beltbuster mead"
 	glass_desc = "The ambrosia of the blubbery gods."
 	shot_glass_icon_state = "shotglassgold"
-	hydration = 4
 
 /datum/reagent/consumable/ethanol/beltbuster_mead/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -70,7 +67,6 @@
 	glass_name = "heavy cafe"
 	glass_desc = "To enjoy slow mornings with."
 	shot_glass_icon_state = "shotglassbrown"
-	hydration = 3
 
 /datum/reagent/consumable/heavy_cafe/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-5)
@@ -96,7 +92,6 @@
 	glass_name = "fruits tea"
 	glass_desc = "Goes down really easy and stays there for a long time."
 	shot_glass_icon_state = "shotglassgold"
-	hydration = 4
 
 /datum/reagent/consumable/fruits_tea/on_mob_life(mob/living/carbon/M)
 	M.dizziness = max(0,M.dizziness-2)
@@ -123,7 +118,6 @@
 	glass_name = "snakebite"
 	glass_desc = "Won't hurt like a real bite, but you'll still regert drinking this."
 	shot_glass_icon_state = "shotglassgreen"
-	hydration = 4
 
 /datum/reagent/consumable/snakebite/on_mob_life(mob/living/carbon/M)
 	if(M && M?.client?.prefs.weight_gain_food) // GS13
@@ -143,7 +137,6 @@
 	glass_name = "vanilla milkshake"
 	glass_desc = "Guess they fixed the milkshake machine after all, huh?"
 	shot_glass_icon_state = "shotglasscream"
-	hydration = 3
 
 /datum/reagent/consumable/milkshake_chocolate
 	name = "Chocolate Milkshake"
@@ -156,4 +149,3 @@
 	glass_name = "chocolate milkshake"
 	glass_desc = "Nothing better than cream AND cocoa!"
 	shot_glass_icon_state = "shotglassbrown"
-	hydration = 3

GainStation13/code/modules/reagents/reagent_containers/barrel_tank.dm

@@ -46,7 +46,7 @@
 
 /obj/item/reagent_containers/barrel_tank/equipped(mob/user, slot)
 	..()
-	if(slot != SLOT_BACK && U != null)
+	if(slot !=ITEM_SLOT_BACK && U != null)
 		to_chat(user, "<span class='warning'>The barrel's tube slips out of your mouth!</span>")
 		U = null
 

GainStation13/code/modules/research/techweb/nutritech_nodes.dm

@@ -8,7 +8,6 @@
 	design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2)
-	export_price = 5000
 	hidden = TRUE
 
 /datum/techweb_node/nutritech_weapons
@@ -19,5 +18,4 @@
 	design_ids = list("fatoray_weak", "fatoray_cannon_weak", "alter_ray_metabolism", "alter_ray_reverser", "borg_upgrade_fatoray", "bwomf_nanites")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
 	boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2)
-	export_price = 10000
 	hidden = TRUE

GainStation13/code/modules/surgery/organs/augments.dm

@@ -5,10 +5,8 @@
 	desc = "This implant was meant to prevent people from going hungry, but due to a flaw in its designs, it permanently produces a small amount of nutriment overtime."
 	icon_state = "chest_implant"
 	implant_color = "#006607"
-	nutrition_amount = 20 //somewhere around 5 pounds
 	hunger_threshold = NUTRITION_LEVEL_FULL
 	poison_amount = 10
-	message = "" //no message cuz spam is annoying
 
 /obj/item/organ/cyberimp/chest/mobility
 	name = "Mobility Nanite Core"
@@ -16,10 +14,11 @@
 	icon_state = "chest_implant"
 	implant_color = "#9034db"
 
-/obj/item/organ/cyberimp/chest/mobility/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/cyberimp/chest/mobility/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	ADD_TRAIT(M, TRAIT_NO_FAT_SLOWDOWN, src)
 
-/obj/item/organ/cyberimp/chest/mobility/Remove(mob/living/carbon/M, special = 0)
+/obj/item/organ/cyberimp/chest/mobility/Remove(special = FALSE)
+	var/mob/living/carbon/human/M = owner
 	REMOVE_TRAIT(M, TRAIT_NO_FAT_SLOWDOWN, src)
 	..()

GainStation13/code/modules/vending/gatocola.dm

@@ -1,7 +1,7 @@
 /obj/machinery/vending/gato
 	name = "GATO Vending Machine"
 	desc = "A GATO branded cola machine, a cute little cat is plastered onto it."
-	icon = 'icons/obj/vending.dmi'
+	icon = 'GainStation13/icons/obj/vending.dmi'
 	icon_state = "cola_black"
 	product_slogans = "Meow~, time for some cola!"
 	vend_reply = "Meow~ Meow~"

GainStation13/code/modules/vending/mealdor.dm

@@ -1,7 +1,7 @@
 /obj/machinery/vending/mealdor
 	name = "Meal Vendor"
 	desc = "The vending machine used by starving people. Looks like they've changed the shell, it looks cuter."
-	icon = 'icons/obj/vending.dmi'
+	icon = 'GainStation13/icons/obj/vending.dmi'
 	icon_state = "mealdor"
 	product_slogans = "Are you hungry? Eat some of my food!;Be sure to eat one of our tasty treats!;Was that your stomach? Go ahead, get some food!"
 	vend_reply = "Enjoy your meal."
@@ -40,8 +40,6 @@
 				/obj/item/reagent_containers/food/snacks/cookie = 10,
 				/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
 				/obj/item/reagent_containers/food/snacks/salad = 20,
-				/obj/item/reagent_containers/food/snacks/salad/hellcobb = 10,
-				/obj/item/clothing/under/cowkini = 5,
 				/obj/item/reagent_containers/food/snacks/blueberry_gum = 5
 				)
 	premium = list(

GainStation13/code/obj/items/bluespace_belt.dm

@@ -5,16 +5,16 @@
 	icon_state = "bluespace_belt"
 	item_state = "bluespace_belt"
 	slot_flags = ITEM_SLOT_BELT
-	equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
-	drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
-	pickup_sound =  'sound/items/handling/toolbelt_pickup.ogg'
+	equip_sound = 'GainStation13/sound/items/equip/toolbelt_equip.ogg'
+	drop_sound = 'GainStation13/sound/items/handling/toolbelt_drop.ogg'
+	pickup_sound =  'GainStation13/sound/items/handling/toolbelt_pickup.ogg'
 
 /obj/item/bluespace_belt/equipped(mob/user, slot)
 	..()
 	if(!iscarbon(user))
 		return
 	var/mob/living/carbon/U = user
-	if(slot == SLOT_BELT)
+	if(slot ==ITEM_SLOT_BELT)
 		to_chat(U, "<span class='notice'>You put the belt around your waist and your mass begins to shrink...</span>")
 		U.hider_add(src)
 	else

GainStation13/code/obj/items/pride_pins.dm

@@ -1,47 +0,0 @@
-/obj/item/clothing/accessory/pride_pin
-	name = "pride pin"
-	desc = "A pride pin."
-	icon_state = "pride"
-	item_color = "pride"
-
-/obj/item/clothing/accessory/pride_pin/bi
-	name = "bisexual pride pin"
-	desc = "A bisexual pride pin."
-	icon_state = "pride_bi"
-	item_color = "pride_bi"
-
-/obj/item/clothing/accessory/pride_pin/trans
-	name = "transgender pride pin"
-	desc = "A transgender pride pin."
-	icon_state = "pride_trans"
-	item_color = "pride_trans"
-
-/obj/item/clothing/accessory/pride_pin/ace
-	name = "asexual pride pin"
-	desc = "A asexual pride pin."
-	icon_state = "pride_ace"
-	item_color = "pride_ace"
-
-/obj/item/clothing/accessory/pride_pin/enby
-	name = "non-binary pride pin"
-	desc = "A non-binary pride pin."
-	icon_state = "pride_enby"
-	item_color = "pride_enby"
-
-/obj/item/clothing/accessory/pride_pin/pan
-	name = "pansexual pride pin"
-	desc = "A pansexual pride pin."
-	icon_state = "pride_pan"
-	item_color = "pride_pan"
-
-/obj/item/clothing/accessory/pride_pin/lesbian
-	name = "lesbian pride pin"
-	desc = "A lesbian pride pin."
-	icon_state = "pride_lesbian"
-	item_color = "pride_lesbian"
-
-/obj/item/clothing/accessory/pride_pin/intersex
-	name = "intersex pride pin"
-	desc = "A intersex pride pin."
-	icon_state = "pride_intersex"
-	item_color = "pride_intersex"

GainStation13/code/obj/weapons/fatbeam.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/fatbeam // GS13
 	name = "Fatbeam Gun"
 	desc = "Apparently used to treat malnourished patients from a safe distance... But we all know what it will truly be used for."
-	icon = 'icons/obj/fatbeam.dmi'
+	icon = 'GainStation13/icons/obj/weapons/fatbeam.dmi'
 	icon_state = "fatbeam"
 	item_state = "fatbeam"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -41,7 +41,7 @@
 		on_beam_release(current_target)
 	current_target = null
 
-/obj/item/gun/fatbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/fatbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stan_cost = 0)
 	if(isliving(user))
 		add_fingerprint(user)