Merge pull request #102 from MistakeNot4892/fork/pyrelight

Updating from Neb dev

Author: MistakeNot4892

code/__defines/cooking.dm

@@ -11,14 +11,15 @@
 #define ALLERGEN_FISH      BITFLAG(1)
 #define ALLERGEN_VEGETABLE BITFLAG(2)
 #define ALLERGEN_DAIRY     BITFLAG(3)
-#define ALLERGEN_EGG       BITFLAG(4)
-#define ALLERGEN_FRUIT     BITFLAG(5)
-#define ALLERGEN_GLUTEN    BITFLAG(6)
-#define ALLERGEN_SOY       BITFLAG(7)
-#define ALLERGEN_CAFFEINE  BITFLAG(8)
-#define ALLERGEN_FUNGI     BITFLAG(9)
-#define ALLERGEN_NUTS      BITFLAG(10)
-#define ALLERGEN_ALLIUM    BITFLAG(11)
-#define ALLERGEN_STIMULANT BITFLAG(12)
+#define ALLERGEN_CHEESE    BITFLAG(4)
+#define ALLERGEN_EGG       BITFLAG(5)
+#define ALLERGEN_FRUIT     BITFLAG(6)
+#define ALLERGEN_GLUTEN    BITFLAG(7)
+#define ALLERGEN_SOY       BITFLAG(8)
+#define ALLERGEN_CAFFEINE  BITFLAG(9)
+#define ALLERGEN_FUNGI     BITFLAG(10)
+#define ALLERGEN_NUTS      BITFLAG(11)
+#define ALLERGEN_ALLIUM    BITFLAG(12)
+#define ALLERGEN_STIMULANT BITFLAG(13)
 
-#define INGREDIENT_FLAGS_ALL      (ALLERGEN_MEAT|ALLERGEN_FISH|ALLERGEN_VEGETABLE|ALLERGEN_DAIRY|ALLERGEN_EGG|ALLERGEN_FRUIT|ALLERGEN_GLUTEN|ALLERGEN_SOY|ALLERGEN_CAFFEINE|ALLERGEN_NUTS|ALLERGEN_ALLIUM|ALLERGEN_STIMULANT)
+#define ALLERGENS_ALL      (ALLERGEN_MEAT|ALLERGEN_FISH|ALLERGEN_VEGETABLE|ALLERGEN_DAIRY|ALLERGEN_CHEESE|ALLERGEN_EGG|ALLERGEN_FRUIT|ALLERGEN_GLUTEN|ALLERGEN_SOY|ALLERGEN_CAFFEINE|ALLERGEN_NUTS|ALLERGEN_ALLIUM|ALLERGEN_STIMULANT)

code/__defines/mobs.dm

@@ -227,6 +227,30 @@
 // One 'unit' of taste sensitivity probability, used in mob/living/proc/ingest
 #define TASTE_DEGREE_PROB 15
 
+// General food data flags
+#define DATA_TASTE            /decl/reagent_data_field/taste
+#define DATA_INGREDIENT_LIST  /decl/reagent_data_field/ingredient_list
+#define DATA_INGREDIENT_FLAGS /decl/reagent_data_field/ingredient_flags
+#define DATA_MASK_COLOR       /decl/reagent_data_field/mask_color
+#define DATA_MASK_NAME        /decl/reagent_data_field/mask_name
+
+// Milk and chees data flags
+#define DATA_MILK_DONOR       /decl/reagent_data_field/milk_donor
+#define DATA_MILK_NAME        /decl/reagent_data_field/milk_name
+#define DATA_MILK_COLOR       /decl/reagent_data_field/milk_color
+#define DATA_CHEESE_NAME      /decl/reagent_data_field/cheese_name
+#define DATA_CHEESE_COLOR     /decl/reagent_data_field/cheese_color
+
+// Blood data flags
+#define DATA_BLOOD_DNA        /decl/reagent_data_field/blood_dna
+#define DATA_BLOOD_DONOR      /decl/reagent_data_field/blood_donor
+#define DATA_BLOOD_SPECIES    /decl/reagent_data_field/blood_species
+#define DATA_BLOOD_COLOR      /decl/reagent_data_field/blood_color
+#define DATA_BLOOD_TYPE       /decl/reagent_data_field/blood_type
+#define DATA_BLOOD_TRACE_CHEM /decl/reagent_data_field/blood_trace_chem
+#define DATA_BLOOD_DOSE_CHEM  /decl/reagent_data_field/blood_dose_chem
+#define DATA_BLOOD_HAS_OXY    /decl/reagent_data_field/blood_has_oxy
+
 //Used by show_message() and emotes
 #define VISIBLE_MESSAGE 1
 #define AUDIBLE_MESSAGE 2

code/__defines/reagent_data_fields.dm

@@ -0,0 +1,60 @@
+// Currently just used for indexing reagent data without
+// having to use strings. UID is provided for serde.
+
+/decl/reagent_data_field
+	abstract_type = /decl/reagent_data_field
+	decl_flags = DECL_FLAG_MANDATORY_UID
+
+/decl/reagent_data_field/taste
+	uid = "rdf_taste"
+
+/decl/reagent_data_field/ingredient_list
+	uid = "rdf_ingredient_list"
+
+/decl/reagent_data_field/ingredient_flags
+	uid = "rdf_ingredient_flags"
+
+/decl/reagent_data_field/mask_color
+	uid = "rdf_mask_color"
+
+/decl/reagent_data_field/mask_name
+	uid = "rdf_mask_name"
+
+/decl/reagent_data_field/milk_donor
+	uid = "rdf_milk_donor"
+
+/decl/reagent_data_field/milk_name
+	uid = "rdf_milk_name"
+
+/decl/reagent_data_field/milk_color
+	uid = "rdf_milk_color"
+
+/decl/reagent_data_field/cheese_name
+	uid = "rdf_cheese_name"
+
+/decl/reagent_data_field/cheese_color
+	uid = "rdf_cheese_color"
+
+/decl/reagent_data_field/blood_dna
+	uid = "rdf_blood_dna"
+
+/decl/reagent_data_field/blood_donor
+	uid = "rdf_blood_donor"
+
+/decl/reagent_data_field/blood_species
+	uid = "rdf_blood_species"
+
+/decl/reagent_data_field/blood_color
+	uid = "rdf_blood_color"
+
+/decl/reagent_data_field/blood_type
+	uid = "rdf_blood_type"
+
+/decl/reagent_data_field/blood_trace_chem
+	uid = "rdf_blood_trace_chem"
+
+/decl/reagent_data_field/blood_dose_chem
+	uid = "rdf_blood_dose_chem"
+
+/decl/reagent_data_field/blood_has_oxy
+	uid = "rdf_blood_has_oxy"

code/_helpers/storage.dm

@@ -20,7 +20,7 @@
 /datum/atom_creator/simple
 	var/path
 	var/probability
-	var/prob_method = /proc/prob_call
+	var/prob_method = GLOBAL_PROC_REF(prob_call)
 
 /datum/atom_creator/simple/New(var/path, var/probability)
 	if(args.len != 2)
@@ -36,7 +36,7 @@
 
 /datum/atom_creator/weighted
 	var/list/paths
-	var/selection_method = /proc/pickweight
+	var/selection_method = GLOBAL_PROC_REF(pickweight)
 
 /datum/atom_creator/weighted/New(var/list/paths)
 	if(args.len != 1)

code/_helpers/type2type.dm

@@ -12,16 +12,6 @@
 /proc/file2list(filename, seperator = "\n")
 	return splittext(safe_file2text(filename), seperator)
 
-// Turns a direction into text
-/proc/num2dir(direction)
-	switch (direction)
-		if (1.0) return NORTH
-		if (2.0) return SOUTH
-		if (4.0) return EAST
-		if (8.0) return WEST
-		else
-			to_world_log("UNKNOWN DIRECTION: [direction]")
-
 // Turns a direction into text
 /proc/dir2text(direction)
 	switch (direction)
@@ -40,14 +30,14 @@
 // Turns text into proper directions
 /proc/text2dir(direction)
 	switch (uppertext(direction))
-		if ("NORTH")     return 1
-		if ("SOUTH")     return 2
-		if ("EAST")      return 4
-		if ("WEST")      return 8
-		if ("NORTHEAST") return 5
-		if ("NORTHWEST") return 9
-		if ("SOUTHEAST") return 6
-		if ("SOUTHWEST") return 10
+		if ("NORTH")     return NORTH
+		if ("SOUTH")     return SOUTH
+		if ("EAST")      return EAST
+		if ("WEST")      return WEST
+		if ("NORTHEAST") return NORTHEAST
+		if ("NORTHWEST") return NORTHWEST
+		if ("SOUTHEAST") return SOUTHEAST
+		if ("SOUTHWEST") return SOUTHWEST
 
 // Converts an angle (degrees) into an ss13 direction
 /proc/angle2dir(var/degree)

code/_onclick/item_attack.dm

@@ -32,9 +32,9 @@ avoid code duplication. This includes items that may sometimes act as a standard
 /atom/proc/attackby(obj/item/used_item, mob/user, var/click_params)
 	if(storage)
 		if(isrobot(user) && (used_item == user.get_active_held_item()))
-			return //Robots can't store their modules.
+			return FALSE //Robots can't store their modules.
 		if(!storage.can_be_inserted(used_item, user))
-			return
+			return FALSE
 		used_item.add_fingerprint(user)
 		return storage.handle_item_insertion(user, used_item, click_params = click_params)
 	return FALSE

code/controllers/subsystems/atoms.dm

@@ -72,14 +72,14 @@ SUBSYSTEM_DEF(atoms)
 		BadInitializeCalls[the_type] |= BAD_INIT_QDEL_BEFORE
 		return TRUE
 
-	// This is handled and battle tested by dreamchecker. Limit to UNIT_TESTS just in case that ever fails.
-	#ifdef UNIT_TESTS
+	// This is handled and battle tested by dreamchecker. Limit to UNIT_TEST just in case that ever fails.
+	#ifdef UNIT_TEST
 	var/start_tick = world.time
 	#endif
 
 	var/result = A.Initialize(arglist(arguments))
 
-	#ifdef UNIT_TESTS
+	#ifdef UNIT_TEST
 	if(start_tick != world.time)
 		BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
 	#endif

code/controllers/subsystems/initialization/modpacks.dm

@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(modpacks)
 
 	// Update compiled infolists and apply.
 	default_submap_whitelisted_species |= global.using_map.default_species
-	for(var/decl/submap_archetype/submap in decls_repository.get_decls_unassociated(/decl/submap_archetype))
+	for(var/decl/submap_archetype/submap in decls_repository.get_decls_of_type_unassociated(/decl/submap_archetype))
 		if(islist(submap.whitelisted_species) && !length(submap.whitelisted_species))
 			submap.whitelisted_species |= SSmodpacks.default_submap_whitelisted_species
 		if(islist(submap.blacklisted_species) && !length(submap.blacklisted_species))

code/datums/extensions/milkable/milkable.dm

@@ -48,7 +48,7 @@
 
 /datum/extension/milkable/proc/get_milk_data()
 	var/static/list/milk_data = list(
-		"milk_donor" = "cow"
+		DATA_MILK_DONOR = "cow"
 	)
 	return milk_data.Copy()
 
@@ -130,10 +130,10 @@
 
 /datum/extension/milkable/goat/get_milk_data()
 	var/static/list/milk_data = list(
-		"milk_donor"   = "goat",
-		"milk_name"    = "goat",
-		"cheese_name"  = "feta",
-		"cheese_color" = "#f3f2be",
-		"mask_name"    = "goat's milk",
+		DATA_MILK_DONOR   = "goat",
+		DATA_MILK_NAME    = "goat",
+		DATA_CHEESE_NAME  = "feta",
+		DATA_CHEESE_COLOR = "#f3f2be",
+		DATA_MASK_NAME    = "goat's milk",
 	)
 	return milk_data.Copy()

code/datums/extensions/storage/_storage.dm

@@ -195,16 +195,16 @@ var/global/list/_test_storage_items = list()
 //such as when picking up all the items on a tile with one click.
 /datum/storage/proc/handle_item_insertion(mob/user, obj/item/W, prevent_warning, skip_update, click_params)
 	if(!istype(W))
-		return 0
+		return FALSE
 	if(ismob(W.loc))
 		var/mob/M = W.loc
 		if(!M.try_unequip(W))
-			return
+			return FALSE
 
 	if(holder.reagents?.total_volume)
 		W.fluid_act(holder.reagents)
 		if(QDELETED(W))
-			return
+			return FALSE
 
 	W.forceMove(holder)
 	W.on_enter_storage(src)
@@ -225,7 +225,7 @@ var/global/list/_test_storage_items = list()
 	holder.storage_inserted()
 	if(!skip_update)
 		holder.update_icon()
-	return 1
+	return TRUE
 
 /datum/storage/proc/consolidate_stacks()