more work

2024-09-13 01:50:58 -04:00
parent 8fd779ef02
commit 7b0780804f
320 changed files with 12185 additions and 161 deletions
@@ -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"
@@ -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"
@@ -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)
 	..()


@@ -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
@@ -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

@@ -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
@@ -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)
 	..()
@@ -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~"
@@ -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(