some moire

2026-07-19 02:56:14 +01:00 · 2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
@@ -134,7 +134,7 @@
 // ====
 /datum/medical_effect/itch
 	name = "Itch"
-	triggers = list("bliss" = 10)
+	triggers = list(REAGENT_ID_BLISS = 10)
 	cures = list("inaprovaline")
 	cure_message = "The itching stops..."

@@ -134,7 +134,7 @@
 // ====
 /datum/medical_effect/itch
 	name = "Itch"
-	triggers = list("bliss" = 10)
+	triggers = list(REAGENT_ID_BLISS = 10)
 	cures = list("inaprovaline")
 	cure_message = "The itching stops..."

@@ -1040,7 +1040,7 @@
 /mob/living/carbon/human/revive()

 	if(should_have_organ(O_HEART))
-		vessel.add_reagent("blood",species.blood_volume-vessel.total_volume)
+		vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume-vessel.total_volume)
 		fixblood()

 	species.create_organs(src) // Reset our organs/limbs.
@@ -1313,9 +1313,9 @@
 		make_blood()
 		if(vessel.total_volume < species.blood_volume)
 			vessel.maximum_volume = species.blood_volume
-			vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
+			vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)
 		else if(vessel.total_volume > species.blood_volume)
-			vessel.remove_reagent("blood",vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
+			vessel.remove_reagent(REAGENT_ID_BLOOD,vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart
 			vessel.maximum_volume = species.blood_volume
 		fixblood()
 		species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup.
@@ -1788,7 +1788,7 @@
 		if(species?.flags & NO_BLOOD)
 			bloodtrail = 0
 		else
-			var/blood_volume = vessel.get_reagent_amount("blood")
+			var/blood_volume = vessel.get_reagent_amount(REAGENT_ID_BLOOD)
 			if(blood_volume < species?.blood_volume*species?.blood_level_fatal)
 				bloodtrail = 0	//Most of it's gone already, just leave it be
 			else
@@ -436,7 +436,7 @@ This function restores the subjects blood to max.
 	if(!should_have_organ(O_HEART))
 		return
 	if(vessel.total_volume < species.blood_volume)
-		vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
+		vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume)

 /*
 This function restores all organs.
@@ -1942,7 +1942,7 @@
 	if(Pump)
 		temp += Pump.standard_pulse_level - PULSE_NORM

-	if(round(vessel.get_reagent_amount("blood")) <= species.blood_volume*species.blood_level_danger)	//how much blood do we have
+	if(round(vessel.get_reagent_amount(REAGENT_ID_BLOOD)) <= species.blood_volume*species.blood_level_danger)	//how much blood do we have
 		temp = temp + 3	//not enough :(

 	if(status_flags & FAKEDEATH)
@@ -41,8 +41,8 @@
 	var/show_ssd = "fast asleep"
 	var/virus_immune
 	var/short_sighted										// Permanent weldervision.
-	var/blood_name = "blood"								// Name for the species' blood.
-	var/blood_reagents = "iron"								// Reagent(s) that restore lost blood. goes by reagent IDs.
+	var/blood_name = REAGENT_ID_BLOOD								// Name for the species' blood.
+	var/blood_reagents = REAGENT_ID_IRON								// Reagent(s) that restore lost blood. goes by reagent IDs.
 	var/blood_volume = 560									// Initial blood volume.
 	var/bloodloss_rate = 1									// Multiplier for how fast a species bleeds out. Higher = Faster
 	var/blood_level_safe = 0.85								//"Safe" blood level; above this, you're OK
@@ -338,7 +338,7 @@
 	name = "fruit gland"
 	desc = "A bulbous gourd-like structure."
 	organ_tag = A_FRUIT
-	var/generated_reagents = list("sugar" = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
+	var/generated_reagents = list(REAGENT_ID_SUGAR = 2) //This actually allows them. This could be anything, but sugar seems most fitting.
 	var/usable_volume = 250 //Five fruit.
 	var/transfer_amount = 50
 	var/empty_message = list("Your have no fruit on you.", "You have a distinct lack of fruit..")
@@ -318,7 +318,7 @@
 	flash_mod = 1.2
 	chemOD_mod = 0.9

-	blood_reagents = "copper"
+	blood_reagents = REAGENT_ID_COPPER
 	bloodloss_rate = 1.5

 	ambiguous_genders = TRUE
@@ -87,9 +87,9 @@


 /mob/living/carbon/human/proc/hasnutriment()
-	if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
+	if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein.
 		return TRUE
-	else if (ingested.has_reagent("nutriment", 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
+	else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective.
 		return TRUE
 	else return FALSE

@@ -1621,9 +1621,9 @@
 				continue
 			if(L == src) //no getting high off your own supply, get a nif or something, nerd.
 				continue
-			if(!L.resizable && (trait_injection_selected == "macrocillin" || trait_injection_selected == "microcillin" || trait_injection_selected == "normalcillin")) // If you're using a size reagent, ignore those with pref conflicts.
+			if(!L.resizable && (trait_injection_selected == REAGENT_ID_MACROCILLIN || trait_injection_selected == REAGENT_ID_MICROCILLIN || trait_injection_selected == REAGENT_ID_NORMALCILLIN)) // If you're using a size reagent, ignore those with pref conflicts.
 				continue
-			if(!L.allow_spontaneous_tf && (trait_injection_selected == "androrovir" || trait_injection_selected == "gynorovir" || trait_injection_selected == "androgynorovir")) // If you're using a TF reagent, ignore those with pref conflicts.
+			if(!L.allow_spontaneous_tf && (trait_injection_selected == REAGENT_ID_ANDROROVIR || trait_injection_selected == REAGENT_ID_GYNOROVIR || trait_injection_selected == REAGENT_ID_ANDROGYNOROVIR)) // If you're using a TF reagent, ignore those with pref conflicts.
 				continue
 			targets += L

@@ -206,7 +206,7 @@
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
 	blood_color = "#240bc4"
-	blood_reagents = "copper"
+	blood_reagents = REAGENT_ID_COPPER
 	reagent_tag = IS_ZORREN
 	color_mult = 1

@@ -170,17 +170,17 @@
 /datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..()
 	add_verb(H, /mob/living/proc/injection)
-	H.trait_injection_reagents += "microcillin"		// get small
-	H.trait_injection_reagents += "macrocillin"		// get BIG
-	H.trait_injection_reagents += "normalcillin"	// normal
+	H.trait_injection_reagents += REAGENT_ID_MICROCILLIN		// get small
+	H.trait_injection_reagents += REAGENT_ID_MACROCILLIN		// get BIG
+	H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN	// normal
 	H.trait_injection_reagents += "numbenzyme"		// no feelings
-	H.trait_injection_reagents += "androrovir" 		// -> MALE
-	H.trait_injection_reagents += "gynorovir" 		// -> FEMALE
-	H.trait_injection_reagents += "androgynorovir" 	// -> PLURAL
+	H.trait_injection_reagents += REAGENT_ID_ANDROROVIR 		// -> MALE
+	H.trait_injection_reagents += REAGENT_ID_GYNOROVIR 		// -> FEMALE
+	H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR 	// -> PLURAL
 	H.trait_injection_reagents += "stoxin"			// night night chem
-	H.trait_injection_reagents += "rainbowtoxin" 	// Funny flashing lights.
-	H.trait_injection_reagents += "paralysistoxin" 	// Paralysis!
-	H.trait_injection_reagents += "painenzyme"		// Pain INCREASER
+	H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN 	// Funny flashing lights.
+	H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN 	// Paralysis!
+	H.trait_injection_reagents += REAGENT_ID_PAINENZYME		// Pain INCREASER

 /datum/trait/neutral/long_vore
 	name = "Long Predatorial Reach"
@@ -358,7 +358,7 @@

 /obj/item/reagent_containers/food/snacks/egg/slime/Initialize()
 	. = ..()
-	reagents.add_reagent("nutriment", 4)
+	reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4)
 	reagents.add_reagent("slimejelly", 1)
 	addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS))

@@ -37,7 +37,7 @@ calculate text size per text.
 		for(var/datum/reagent/R in reagent_list)
 			if(!R.taste_mult)
 				continue
-			if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why
+			if(R.id == REAGENT_ID_NUTRIMENT) //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why
 				var/list/taste_data = R.get_data()
 				for(var/taste in taste_data)
 					if(taste in tastes)
@@ -797,7 +797,7 @@
 	name = "Combat Triage Belly"
 	desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios."
 	icon_state = "sleepersyndiemed"
-	injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
+	injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
 	digest_multiplier = 2

 /obj/item/dogborg/sleeper/K9/syndie
@@ -260,7 +260,7 @@ var/global/list/robot_modules = list(

 	var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src)
 	src.emag += PS
-	PS.reagents.add_reagent("pacid", 250)
+	PS.reagents.add_reagent(REAGENT_ID_PACID, 250)
 	PS.name = "Polyacid spray"

 	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000)
@@ -296,7 +296,7 @@ var/global/list/robot_modules = list(

 	var/obj/item/reagent_containers/spray/PS = locate() in src.emag
 	if(PS)
-		PS.reagents.add_reagent("pacid", 2 * amount)
+		PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount)

 	..()

@@ -319,7 +319,7 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/inflatable_dispenser/robot(src)
 	var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src)
 	src.emag += PS
-	PS.reagents.add_reagent("pacid", 250)
+	PS.reagents.add_reagent(REAGENT_ID_PACID, 250)
 	PS.name = "Polyacid spray"

 	var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000)
@@ -355,7 +355,7 @@ var/global/list/robot_modules = list(

 	var/obj/item/reagent_containers/spray/PS = locate() in src.emag
 	if(PS)
-		PS.reagents.add_reagent("pacid", 2 * amount)
+		PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount)

 	..()

@@ -161,7 +161,7 @@
 			return
 		to_chat(user, span_notice("\The [src] seems too full to eat."))
 		return
-	var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much?
+	var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
 	var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
 	var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
 	var/yum = nutriment_amount + protein_amount + glucose_amount
@@ -168,4 +168,4 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
 /obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize()
 	nutriment_amt += inherited_nutriment
 	. = ..()
-	reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc)
+	reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc)
@@ -512,7 +512,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 		if(nutrition >= 5000)
 			user.visible_message(span_notice("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat."),span_notice("You try to feed \the [O] to \the [src], but it only snoofts at it."))
 			return
-		var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much?
+		var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much?
 		var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much?
 		var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much?
 		var/yum = nutriment_amount + protein_amount + glucose_amount
@@ -70,7 +70,7 @@
 /mob/living/simple_mob/animal/borer/handle_special()
 	if(host && !stat && !host.stat)
 		// Handle docility.
-		if(host.reagents.has_reagent("sugar") && !docile)
+		if(host.reagents.has_reagent(REAGENT_ID_SUGAR) && !docile)
 			var/message = "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
 			var/target = controlling ? host : src
 			to_chat(target, span_warning(message))
@@ -109,7 +109,7 @@
 	/obj/item/reagent_containers/food/snacks/meat = 20
 	)

-	var/poison_type = "spidertoxin"	// The reagent that gets injected when it attacks.
+	var/poison_type = REAGENT_ID_SPIDERTOXIN	// The reagent that gets injected when it attacks.
 	var/poison_chance = 10			// Chance for injection to occur.
 	var/poison_per_bite = 5			// Amount added per injection.

@@ -24,7 +24,7 @@

 	poison_chance = 15
 	poison_per_bite = 2
-	poison_type = "psilocybin"
+	poison_type = REAGENT_ID_PSILOCYBIN

 	ai_holder_type = /datum/ai_holder/simple_mob/ranged/electric_spider

@@ -62,4 +62,4 @@
 	can_lay_eggs = FALSE

 /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless
-	can_lay_eggs = FALSE
+	can_lay_eggs = FALSE
@@ -34,7 +34,7 @@
 	melee_damage_lower = 8
 	melee_damage_upper = 15
 	poison_per_bite = 2
-	poison_type = "psilocybin"
+	poison_type = REAGENT_ID_PSILOCYBIN
 	player_msg = "You can fire a ranged attack by clicking on an enemy or tile at a distance."
 	ai_holder_type = /datum/ai_holder/simple_mob/ranged

@@ -57,4 +57,4 @@
 		return
 	B.old_style_target(A, src)
 	B.fire()
-	set_AI_busy(FALSE)
+	set_AI_busy(FALSE)
@@ -198,7 +198,7 @@
 				chemicals -= 50

 			if(host.getOxyLoss() >= 30 && chemicals > 50)
-				host.reagents.add_reagent("iron", 10)
+				host.reagents.add_reagent(REAGENT_ID_IRON, 10)
 				chemicals -= 40

 			if(host.getBrainLoss() >= 10 && chemicals > 100)
@@ -158,7 +158,7 @@
 	icon = 'icons/mob/snake_vr.dmi'
 	icon_state = "snack_yellow"
 	nutriment_amt = 1
-	nutriment_desc = list("sugar" = 1)
+	nutriment_desc = list(REAGENT_ID_SUGAR = 1)

 /obj/item/reagent_containers/food/snacks/snakesnack/Initialize()
 	. = ..()
@@ -166,7 +166,7 @@
 		snack_colour = pick( list("yellow","green","pink","blue") )
 	icon_state = "snack_[snack_colour]"
 	desc = "A little mouse treat made of coloured sugar. Noodle loves these! This one is [snack_colour]."
-	reagents.add_reagent("sugar", 2)
+	reagents.add_reagent(REAGENT_ID_SUGAR, 2)

 /obj/item/storage/box/snakesnackbox
 	name = "box of Snake Snax"
@@ -509,7 +509,7 @@
 	slime_color = "green"
 	coretype = /obj/item/slime_extract/green
 	glow_toggle = TRUE
-	reagent_injected = "radium"
+	reagent_injected = REAGENT_ID_RADIUM
 	var/rads = 25

 	description_info = "This slime will irradiate anything nearby passively, and will inject radium on attack.  \
@@ -40,7 +40,7 @@

 	faction = FACTION_BEE

-	var/poison_type = "spidertoxin"	// The reagent that gets injected when it attacks, can be changed to different toxin.
+	var/poison_type = REAGENT_ID_SPIDERTOXIN	// The reagent that gets injected when it attacks, can be changed to different toxin.
 	var/poison_chance = 10			// Chance for injection to occur.
 	var/poison_per_bite = 1			// Amount added per injection.

@@ -1007,7 +1007,7 @@ I think I covered everything.
 				//Alternatively bully a coder (me) to make a unique digest_mode for mob healbellies that prevents death, or something.
 				if(istype(A, /mob/living/carbon/human))
 					var/mob/living/carbon/human/P = L
-					var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", "iron", "hyronalin")
+					var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", REAGENT_ID_IRON, "hyronalin")
 					//Lets not OD them...
 					for(var/RG in to_inject)
 						if(!P.reagents.has_reagent(RG))