Cleaning up post Neb merge.

.gitignore

@@ -26,6 +26,9 @@ sql/test_db
 *.code-workspace
 .history
 
+# git/kdiff4
+*.orig
+
 # swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
@@ -52,4 +55,4 @@ lib/*.so
 __pycache__
 
 # Running OpenDream locally
-nebula.json
+nebula.json

code/__defines/damage_organs.dm

@@ -12,6 +12,7 @@
 #define PIERCE    "pierce"
 #define LASER     "laser"
 #define SHATTER   "shatter"
+#define CHARRED   "charred"
 
 #define STUN      "stun"
 #define WEAKEN    "weaken"

code/__defines/genetics.dm

@@ -0,0 +1,21 @@
+#define GENE_COND_COLD_RESISTANCE  /decl/genetic_condition/superpower/cold_resist
+#define GENE_COND_XRAY             /decl/genetic_condition/superpower/xray
+#define GENE_COND_SPACE_RESISTANCE /decl/genetic_condition/superpower/space_resist
+#define GENE_COND_NO_BREATH        /decl/genetic_condition/superpower/no_breath
+#define GENE_COND_REMOTE_TALK      /decl/genetic_condition/superpower/remotetalk
+#define GENE_COND_RUNNING          /decl/genetic_condition/superpower/running
+#define GENE_COND_REMOTE_VIEW      /decl/genetic_condition/superpower/remoteview
+#define GENE_COND_SHAPESHIFTER     /decl/genetic_condition/superpower/morph
+#define GENE_COND_NO_FINGERPRINTS  /decl/genetic_condition/superpower/noprints
+
+#define GENE_COND_CLUMSY           /decl/genetic_condition/disability/clumsy
+#define GENE_COND_NEARSIGHTED      /decl/genetic_condition/disability/nearsighted
+#define GENE_COND_EPILEPSY         /decl/genetic_condition/disability/epilepsy
+#define GENE_COND_COUGHING         /decl/genetic_condition/disability/coughing
+#define GENE_COND_TOURETTES        /decl/genetic_condition/disability/tourettes
+#define GENE_COND_NERVOUS          /decl/genetic_condition/disability/nervous
+#define GENE_COND_BLINDED          /decl/genetic_condition/disability/blinded
+#define GENE_COND_MUTED            /decl/genetic_condition/disability/muted
+#define GENE_COND_DEAFENED         /decl/genetic_condition/disability/deafened
+
+#define GENE_COND_HUSK             /decl/genetic_condition/husk

code/__defines/misc.dm

@@ -244,10 +244,6 @@
 //Inserts 'a' or 'an' before X in ways \a doesn't allow
 #define ADD_ARTICLE(X) "[(lowertext(X[1]) in global.vowels) ? "an" : "a"] [X]"
 
-#define SOULSTONE_CRACKED -1
-#define SOULSTONE_EMPTY 0
-#define SOULSTONE_ESSENCE 1
-
 //Request Console Department Types
 #define RC_ASSIST 1		//Request Assistance
 #define RC_SUPPLY 2		//Request Supplies

code/__defines/mobs.dm

@@ -64,18 +64,17 @@
 #define ROBOT_NOTIFICATION_MODULE_RESET 4
 
 // Appearance change flags
-#define APPEARANCE_UPDATE_DNA        BITFLAG(0)
-#define APPEARANCE_RACE              (BITFLAG(1)|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_GENDER            BITFLAG(2)
-#define APPEARANCE_BODY              (BITFLAG(3)|APPEARANCE_UPDATE_DNA)
-#define APPEARANCE_SKIN              BITFLAG(4)
-#define APPEARANCE_HAIR              BITFLAG(5)
-#define APPEARANCE_HAIR_COLOR        BITFLAG(6)
-#define APPEARANCE_FACIAL_HAIR       BITFLAG(7)
-#define APPEARANCE_FACIAL_HAIR_COLOR BITFLAG(8)
-#define APPEARANCE_EYE_COLOR         BITFLAG(9)
+#define APPEARANCE_RACE              BITFLAG(0)
+#define APPEARANCE_GENDER            BITFLAG(1)
+#define APPEARANCE_BODY              BITFLAG(2)
+#define APPEARANCE_SKIN              BITFLAG(3)
+#define APPEARANCE_HAIR              BITFLAG(4)
+#define APPEARANCE_HAIR_COLOR        BITFLAG(5)
+#define APPEARANCE_FACIAL_HAIR       BITFLAG(6)
+#define APPEARANCE_FACIAL_HAIR_COLOR BITFLAG(7)
+#define APPEARANCE_EYE_COLOR         BITFLAG(8)
 #define APPEARANCE_ALL_HAIR          (APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR)
-#define APPEARANCE_ALL               (APPEARANCE_UPDATE_DNA|APPEARANCE_RACE|APPEARANCE_GENDER|APPEARANCE_BODY|APPEARANCE_SKIN|APPEARANCE_EYE_COLOR|APPEARANCE_ALL_HAIR)
+#define APPEARANCE_ALL               (APPEARANCE_RACE|APPEARANCE_GENDER|APPEARANCE_BODY|APPEARANCE_SKIN|APPEARANCE_EYE_COLOR|APPEARANCE_ALL_HAIR)
 
 // Click cooldown
 #define DEFAULT_ATTACK_COOLDOWN 8 //Default timeout for aggressive actions
@@ -224,14 +223,14 @@
 #define MOB_PULL_SAME 2
 #define MOB_PULL_LARGER 3
 
-//carbon taste sensitivity defines, used in mob/living/carbon/proc/ingest
+// Taste sensitivity defines, used in mob/living/proc/ingest.
 #define TASTE_HYPERSENSITIVE 3 //anything below 5%
 #define TASTE_SENSITIVE 2 //anything below 7%
 #define TASTE_NORMAL 1 //anything below 15%
 #define TASTE_DULL 0.5 //anything below 30%
 #define TASTE_NUMB 0.1 //anything below 150%
 
-// One 'unit' of taste sensitivity probability, used in mob/living/carbon/proc/ingest
+// One 'unit' of taste sensitivity probability, used in mob/living/proc/ingest
 #define TASTE_DEGREE_PROB 15
 
 //Used by show_message() and emotes
@@ -324,7 +323,7 @@ var/global/list/dexterity_levels = list(
 	"[DEXTERITY_BASE]"
 )
 
-// used in /mob/living/carbon/human/can_inject, and by various callers of that proc
+// used in /mob/living/human/can_inject, and by various callers of that proc
 #define CAN_INJECT 1
 #define INJECTION_PORT 2
 #define INJECTION_PORT_DELAY 3 SECONDS // used by injectors to apply delay due to searching for a port on the injectee's suit
@@ -348,7 +347,7 @@ var/global/list/dexterity_levels = list(
 #define NEUTER_ANIMATE "animate singular neutral"
 
 // Equipment Overlays Indices //
-#define HO_MUTATIONS_LAYER  1
+#define HO_CONDITION_LAYER  1
 #define HO_SKIN_LAYER       2
 #define HO_DAMAGE_LAYER     3
 #define HO_SURGERY_LAYER    4 //bs12 specific.

code/__defines/traits.dm

@@ -0,0 +1,61 @@
+#define TRAIT_LEVEL_EXISTS   0
+#define TRAIT_LEVEL_MINOR    1
+#define TRAIT_LEVEL_MODERATE 2
+#define TRAIT_LEVEL_MAJOR    3
+
+#define DEFINE_ROBOLIMB_MODEL_TRAITS(MODEL_PATH, MODEL_ID, COST) \
+/decl/trait/prosthetic_limb/left_hand/##MODEL_ID {               \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/left_hand;              \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/left_arm/##MODEL_ID {                \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/left_arm;               \
+	trait_cost = COST;                                           \
+}                                                                \
+/decl/trait/prosthetic_limb/right_hand/##MODEL_ID {              \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/right_hand;             \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/right_arm/##MODEL_ID {               \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/right_arm;              \
+	trait_cost = COST;                                           \
+}                                                                \
+/decl/trait/prosthetic_limb/left_foot/##MODEL_ID {               \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/left_foot;              \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/left_leg/##MODEL_ID {                \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/left_leg;               \
+	trait_cost = COST;                                           \
+}                                                                \
+/decl/trait/prosthetic_limb/right_foot/##MODEL_ID {              \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/right_foot;             \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/right_leg/##MODEL_ID {               \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/right_leg;              \
+	trait_cost = COST;                                           \
+}                                                                \
+/decl/trait/prosthetic_limb/head/##MODEL_ID {                    \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/head;                   \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/chest/##MODEL_ID {                   \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/chest;                  \
+	trait_cost = COST * 0.5;                                     \
+}                                                                \
+/decl/trait/prosthetic_limb/groin/##MODEL_ID {                   \
+	model = MODEL_PATH;                                          \
+	parent = /decl/trait/prosthetic_limb/groin;                  \
+	trait_cost = COST * 0.5;                                     \
+}

code/_global_vars/lists/clothing.dm

@@ -38,3 +38,9 @@ var/global/list/abstract_inventory_slots = list(
 var/global/list/vitals_sensor_equip_slots = list(
 	slot_w_uniform_str
 )
+
+var/global/list/headphone_slots = list(
+	slot_l_ear_str, 
+	slot_r_ear_str, 
+	slot_head_str
+)

code/_global_vars/lists/names.dm

@@ -3,8 +3,6 @@
 var/global/list/ai_names =           file2list("config/names/ai.txt")
 var/global/list/wizard_first =       file2list("config/names/wizardfirst.txt")
 var/global/list/wizard_second =      file2list("config/names/wizardsecond.txt")
-var/global/list/ninja_titles =       file2list("config/names/ninjatitle.txt")
-var/global/list/ninja_names =        file2list("config/names/ninjaname.txt")
 
 var/global/list/verbs =              file2list("config/names/verbs.txt")
 var/global/list/adjectives =         file2list("config/names/adjectives.txt")

code/_global_vars/lists/objects.dm

@@ -5,7 +5,6 @@ var/global/list/hud_icon_reference = list()
 var/global/list/listening_objects = list() // List of objects that need to be able to hear, used to avoid recursive searching through contents.
 var/global/list/global_map = list()
 
-var/global/host = null //only here until check @ code\modules\ghosttrap\trap.dm:112 is fixed
 var/global/datum/universal_state/universe = new
 
 /// Vowels.

code/_helpers/game.dm

@@ -402,10 +402,6 @@
 /proc/SecondsToTicks(var/seconds)
 	return seconds * 10
 
-/proc/round_is_spooky(var/spookiness_threshold = get_config_value(/decl/config/num/cult_ghostwriter_req_cultists))
-	var/decl/special_role/cult = GET_DECL(/decl/special_role/cultist)
-	return (cult.current_antagonists.len > spookiness_threshold)
-
 /proc/window_flash(var/client_or_usr)
 	if (!client_or_usr)
 		return

code/_helpers/global_lists.dm

@@ -59,7 +59,7 @@ var/global/list/string_slot_flags = list(
 		mannequins_ = new()
 	. = mannequins_[ckey]
 	if(!.)
-		. = new /mob/living/carbon/human/dummy/mannequin()
+		. = new /mob/living/human/dummy/mannequin()
 		mannequins_[ckey] = .
 
 /hook/global_init/proc/makeDatumRefLists()