sugar

PMC-Unga-Marines · Aug 3, 2024 · 38b1d4b · 38b1d4b
1 parent 333ea87
commit 38b1d4b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -293,9 +293,6 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 	/obj/item/armor_module/module/welding/superior = list(CAT_FCSUP, "Superior welding module", 2, "yellow"),
 	/obj/item/storage/box/crate/minisentry = list(CAT_FCSUP, "ST-580 point defense sentry kit", 15, "yellow"),
 	/obj/item/healthanalyzer/gloves = list(CAT_FCSUP, "Health scanner gloves", 2, "yellow"),
-	/obj/item/defibrillator/gloves = list(CAT_FCSUP, "Advanced medical gloves", 4, "yellow"),
-	/obj/item/defibrillator/advanced = list(CAT_FCSUP, "advanced emergency defibrillator", 4, "yellow"),
-	/obj/item/storage/pouch/medical_injectors/medic = list(CAT_FCSUP, "Advanced Injector Pouch", 16, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = list(CAT_FCSUP, "Injector (Dexalin)", 1, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_FCSUP, "Injector (Synaptizine)", 2, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/combat_advanced = list(CAT_FCSUP, "Injector (Advanced)", 2, "cyan"),

diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm
@@ -261,3 +261,13 @@
 		/datum/reagent/medicine/tricordrazine = 2.5,
 	)
 	pill_id = 21
+
+/obj/item/reagent_containers/pill/doctor_delight
+	pill_desc = "A doctor's delight pill. Used to heal wounds slowly at cost of your hunger and stamina, can't be overdosed."
+	list_reagents = list(/datum/reagent/consumable/drink/doctor_delight = 15)
+	pill_id = 15
+
+/obj/item/reagent_containers/pill/sugar
+	pill_desc = "A sugar pill. Used to prevent hunger"
+	list_reagents = list(/datum/reagent/consumable/sugar = 15)
+	pill_id = 18
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
@@ -500,6 +500,24 @@
 	greyscale_config = /datum/greyscale_config/pillbottleround
 	description_overlay = "Cm"
 
+/obj/item/storage/pill_bottle/doctor_delight
+	name = "doctor's delight pill bottle"
+	desc = "Contains pills used to heal slowly."
+	icon_state = "pill_canistercomplete"
+	pill_type_to_fill = /obj/item/reagent_containers/pill/doctor_delight
+	greyscale_colors = "#A3295C#ffffff"
+	greyscale_config = /datum/greyscale_config/pillbottleround
+	description_overlay = "Dd"
+
+/obj/item/storage/pill_bottle/sugar
+	name = "sugar pill bottle"
+	desc = "Contains pills used to prevent hunger, yum!"
+	icon_state = "pill_canistercomplete"
+	pill_type_to_fill = /obj/item/reagent_containers/pill/sugar
+	greyscale_colors = "#ECFC00#ffffff"
+	greyscale_config = /datum/greyscale_config/pillbottleround
+	description_overlay = "Su"
+
 /obj/item/storage/pill_bottle/happy
 	name = "happy pill bottle"
 	desc = "Contains highly illegal drugs. When you want to see the rainbow."

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -952,6 +952,8 @@
 			/obj/item/storage/pill_bottle/dexalin = -1,
 			/obj/item/storage/pill_bottle/paracetamol = -1,
 			/obj/item/storage/pill_bottle/isotonic = -1,
+			/obj/item/storage/pill_bottle/sugar = -1,
+			/obj/item/storage/pill_bottle/doctor_delight = -1,
 			/obj/item/storage/pill_bottle = -1,
 		),
 		"Auto Injector" = list(
@@ -997,6 +999,8 @@
 			/obj/item/storage/pill_bottle/dexalin = -1,
 			/obj/item/storage/pill_bottle/paracetamol = -1,
 			/obj/item/storage/pill_bottle/isotonic = -1,
+			/obj/item/storage/pill_bottle/sugar = -1,
+			/obj/item/storage/pill_bottle/doctor_delight = -1,
 			/obj/item/storage/pill_bottle = -1,
 		),
 		"Auto Injector" = list(

diff --git a/code/modules/clothing/modular_armor/attachments/storage.dm b/code/modules/clothing/modular_armor/attachments/storage.dm
@@ -346,8 +346,8 @@
 	storage = /obj/item/storage/internal/modular/injector
 
 /obj/item/storage/internal/modular/injector
-	max_storage_space = 10
-	storage_slots = 10
+	max_storage_space = 14
+	storage_slots = 14
 	max_w_class = WEIGHT_CLASS_TINY
 	can_hold = list(
 		/obj/item/reagent_containers/syringe,

diff --git a/code/modules/reagents/reagents/food.dm b/code/modules/reagents/reagents/food.dm
@@ -82,7 +82,7 @@
 	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
 	color = "#FFFFFF" // rgb: 255, 255, 255
 	taste_multi = 1.5 // stop sugar drowning out other flavours
-	nutriment_factor = 10
+	nutriment_factor = 4 //still more than bars, but not to much
 	taste_description = "sweetness"
 
 /datum/reagent/consumable/virus_food