Merge branch 'minor_reworks' of https://github.com/GDLW24/GS13 into minor_reworks

code/_globalvars/lists/vending.dm

@@ -39,7 +39,7 @@ GLOBAL_VAR_INIT(vending_m_choices, list(
 	"Meal Vendor"								= image(icon = 'icons/obj/vending.dmi', icon_state = "mealdor"),
 	"GATO Vending Machine"						= image(icon = 'icons/obj/vending.dmi', icon_state = "cola_black"),
 ))
-// This GLOBAL list is just here to be here.
+// This GLOBAL list is used in the vending machine circuit board code.
 GLOBAL_VAR_INIT(vending_machines, list(
 	/obj/machinery/vending/boozeomat,
 	/obj/machinery/vending/coffee,

code/datums/diseases/advance/symptoms/weight.dm

@@ -51,3 +51,43 @@ Bonus
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
 			M.nutrition = max(M.nutrition - 100, 0)
+			M.fatness = M.fatness - 30
+
+
+
+/datum/symptom/weight_gain
+
+	name = "Weight Gain"
+	desc = "The virus mutates and merges itself with the host's adipocytes, allowing them to perform a form of mitosis and replicate on their own."
+	stealth = -3
+	resistance = -2
+	stage_speed = 3
+	transmittable = -2
+	level = 8    //better hope someone went mining kiddo
+	severity = 5
+	base_message_chance = 100
+	symptom_delay_min = 15
+	symptom_delay_max = 45
+	threshold_desc = list(
+		"Transmission 7" = "Increases the rate of cell replication.",
+		"Transmission 14" = "Increases the rate of cell replication further"
+	)
+
+
+/datum/symptom/weight_gain/Activate(datum/disease/advance/A)
+	if(!..())
+		return
+	var/mob/living/M = A.affected_mob
+	switch(A.stage)
+		if(1, 2, 3, 4)
+			if(prob(base_message_chance))
+				to_chat(M, "<span class='warning'>[pick("You feel oddly full...", "You feel more plush...", "You feel more huggable...", "You hear an odd gurgle from your stomach")]</span>")
+		else
+			to_chat(M, "<span class='warning'><i>[pick("You feel your body churn...", "You feel heavier...", "You hear an ominous gurgle from your belly...", "You feel bulkier...")]</i></span>")
+			if(A.properties["transmittable"] >= 14) //get chunkier quicker
+				M.fatness = M.fatness + 70
+			else if(A.properties["transmittable"] >= 7)
+				M.fatness = M.fatness + 40
+			else
+				M.fatness = M.fatness + 15
+

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -246,6 +246,14 @@
 		/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
 		/obj/machinery/vending/games = "\improper Good Clean Fun",
 		/obj/machinery/vending/autodrobe = "AutoDrobe",
+		/obj/machinery/vending/assist = "Vendomat",
+		/obj/machinery/vending/engivend = "Engi-Vend",
+		/obj/machinery/vending/tool ="YouTool",
+		/obj/machinery/vending/sustenance = "Sustenance Vendor",
+		/obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor",
+		/obj/machinery/vending/cart = "PTech",
+		/obj/machinery/vending/hydronutrients = "NutriMax",
+		/obj/machinery/vending/hydroseeds = "MegaSeed Servitor",
 		/obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe",
 		/obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe",
 		/obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe",
@@ -266,7 +274,9 @@
 		/obj/machinery/vending/clothing = "ClothesMate",
 		/obj/machinery/vending/medical = "NanoMed Plus",
 		/obj/machinery/vending/wallmed = "NanoMed",
-		/obj/machinery/vending/kink = "\improper KinkMate")
+		/obj/machinery/vending/kink = "\improper KinkMate",
+		/obj/machinery/vending/mealdor = "Meal Vendor",
+		/obj/machinery/vending/gato = "GATO Vending Machine")
 
 /obj/item/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/screwdriver))
@@ -278,9 +288,8 @@
 		if(!choiceposition)
 			return
 		var/typepath = GLOB.vending_machines[choiceposition]
-		var/namepath = vending_names_paths[choiceposition]
 		set_type(typepath)
-		to_chat(user, "<span class='notice'>You set the board to \"[vending_names_paths[namepath]]\".</span>")
+		to_chat(user, "<span class='notice'>You set the board to \"[choice]\".</span>")
 	else
 		return ..()
 
@@ -1022,4 +1031,4 @@
 		/obj/item/stack/sheet/glass = 2,
 		/obj/item/stock_parts/capacitor = 1,
 		/obj/item/stack/cable_coil = 5,
-		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
+		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems

code/modules/antagonists/disease/disease_abilities.dm

@@ -46,7 +46,8 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	new /datum/disease_ability/symptom/powerful/heal/plasma,
 	new /datum/disease_ability/symptom/powerful/heal/radiation,
 	new /datum/disease_ability/symptom/powerful/heal/coma,
-	new /datum/disease_ability/symptom/powerful/youth
+	new /datum/disease_ability/symptom/powerful/youth,
+	new /datum/disease_ability/symptom/medium/heal/weight_gain
 	))
 
 /datum/disease_ability
@@ -275,9 +276,9 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 /datum/disease_ability/symptom/medium
 	category = "Symptom"
 
-/datum/disease_ability/symptom/medium/heal
-	cost = 5
-	required_total_points = 5
+/datum/disease_ability/symptom/medium/heal //changes here to allow for more funky sentient diseases on lowpop, cus sentinent diseases can't get any of the crazy symptoms without 10+ peeps on and we can't hit that consistently
+	cost = 2
+	required_total_points = 2
 	category = "Symptom (+)"
 
 /datum/disease_ability/symptom/powerful
@@ -419,6 +420,11 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
 	short_desc = "Cause victims to become eternally young."
 	long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
 
+/datum/disease_ability/symptom/medium/heal/weight_gain
+	symptoms = list(/datum/symptom/weight_gain)
+	short_desc = "Cause victims to gain weight."
+	long_desc = "Cause victims to gain weight. Boosts stage speed, but weakens all other stats."
+
 /****HEALING SUBTYPE****/
 
 /datum/disease_ability/symptom/powerful/heal/starlight

code/modules/cargo/packs/service.dm

@@ -335,3 +335,10 @@
 	cost = 1500
 	contains = list(/obj/item/vending_refill/cola)
 	crate_name = "soft drinks supply crate"
+
+/datum/supply_pack/service/vending/mealdor
+	name = "Meal Vendor Supply Crate"
+	desc = "Suprising one to order. If you need a refill for the meal vendor, someone's immobile somewhere. And since you managed to make it to cargo... Well it's not our job to say no!"
+	cost = 10000
+	contains = list(/obj/item/vending_refill/mealdor)
+	crate_name = "meal vendor supply crate"

code/modules/jobs/job_types/silicon.dm

@@ -74,7 +74,7 @@ Cyborg
 	flag = CYBORG
 	department_flag = ENGSEC
 	faction = "Station"
-	total_positions = 0
+	total_positions = 1
 	spawn_positions = 1
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"