Merge pull request #16 from MistakeNot4892/fork/pyrelight

Updating from Neb dev, take 2.

.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/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
@@ -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/_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/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()

code/_helpers/medical_scans.dm

@@ -1,5 +1,5 @@
-/mob/living/carbon/human/proc/get_raw_medical_data(var/tag = FALSE)
-	var/mob/living/carbon/human/H = src
+/mob/living/human/proc/get_raw_medical_data(var/tag = FALSE)
+	var/mob/living/human/H = src
 	var/list/scan = list()
 
 	scan["name"] = H.name
@@ -88,9 +88,9 @@
 	for(var/organ_name in root_bodytype.has_organ)
 		if(!GET_INTERNAL_ORGAN(H, organ_name))
 			scan["missing_organs"] += organ_name
-	if(H.sdisabilities & BLINDED)
+	if(H.has_genetic_condition(GENE_COND_BLINDED))
 		scan["blind"] = TRUE
-	if(H.sdisabilities & NEARSIGHTED)
+	if(H.has_genetic_condition(GENE_COND_NEARSIGHTED))
 		scan["nearsight"] = TRUE
 	return scan
 

code/_helpers/mobs.dm

@@ -209,7 +209,7 @@
 				continue
 			//They need a brain!
 			if(ishuman(M))
-				var/mob/living/carbon/human/H = M
+				var/mob/living/human/H = M
 				if(H.should_have_organ(BP_BRAIN) && !H.has_brain())
 					continue
 			if(M.ckey == find_key)

code/_macros.dm

@@ -32,7 +32,7 @@
 
 #define isEye(A) istype(A, /mob/observer/eye)
 
-#define ishuman(A) istype(A, /mob/living/carbon/human)
+#define ishuman(A) istype(A, /mob/living/human)
 
 #define isitem(A) istype(A, /obj/item)
 

code/_onclick/hud/human.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/human
+/mob/living/human
 	hud_used = /datum/hud/human
 
 /datum/hud/human/FinalizeInstantiation()
@@ -7,7 +7,7 @@
 	var/ui_color = get_ui_color()
 	var/ui_alpha = get_ui_alpha()
 
-	var/mob/living/carbon/human/target = mymob
+	var/mob/living/human/target = mymob
 	var/datum/hud_data/hud_data = istype(target?.species?.species_hud) ? target.species.species_hud : new
 
 	hotkeybuttons = list() //These can be disabled for hotkey usersx
@@ -101,7 +101,7 @@
 
 	..()
 
-/mob/living/carbon/human/verb/toggle_hotkey_verbs()
+/mob/living/human/verb/toggle_hotkey_verbs()
 	set category = "OOC"
 	set name = "Toggle hotkey buttons"
 	set desc = "This disables or enables the user interface buttons which can be used with hotkeys."

code/_onclick/hud/screen/screen_attack_selector.dm

@@ -4,14 +4,14 @@
 	screen_loc = ui_attack_selector
 
 /obj/screen/default_attack_selector/Destroy()
-	var/mob/living/carbon/human/owner = owner_ref?.resolve()
+	var/mob/living/human/owner = owner_ref?.resolve()
 	if(istype(owner) && owner.attack_selector == src)
 		owner.attack_selector = null
 	. = ..()
 
 /obj/screen/default_attack_selector/handle_click(mob/user, params)
 
-	var/mob/living/carbon/human/owner = owner_ref?.resolve()
+	var/mob/living/human/owner = owner_ref?.resolve()
 	if(user != owner)
 		return FALSE
 
@@ -28,6 +28,6 @@
 	return TRUE
 
 /obj/screen/default_attack_selector/on_update_icon()
-	var/mob/living/carbon/human/owner = owner_ref?.resolve()
+	var/mob/living/human/owner = owner_ref?.resolve()
 	var/decl/natural_attack/attack = istype(owner) && owner.default_attack
 	icon_state = attack?.selector_icon_state || "attack_none"

code/_onclick/hud/screen/screen_equip.dm

@@ -4,5 +4,5 @@
 
 /obj/screen/equip/handle_click(mob/user, params)
 	if(ishuman(usr))
-		var/mob/living/carbon/human/H = usr
+		var/mob/living/human/H = usr
 		H.quick_equip()

code/_onclick/hud/screen/screen_setup.dm

@@ -20,7 +20,7 @@
 /obj/screen/setup_preview/bg/Click(location, control, params)
 	if(pref)
 		pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
-		var/mob/living/carbon/human/dummy/mannequin/mannequin = get_mannequin(pref.client_ckey)
+		var/mob/living/human/dummy/mannequin/mannequin = get_mannequin(pref.client_ckey)
 		if(mannequin)
 			pref.update_character_previews(mannequin)
 	return ..()

code/_onclick/item_attack.dm

@@ -61,7 +61,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 		return TRUE
 	return I.use_on_mob(src, user)
 
-/mob/living/carbon/human/attackby(obj/item/I, mob/user)
+/mob/living/human/attackby(obj/item/I, mob/user)
 
 	. = ..()
 	if(.)

code/_onclick/other_mobs.dm

@@ -40,10 +40,10 @@
 	return FALSE
 
 
-/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
+/mob/living/human/RestrainedClickOn(var/atom/A)
 	return
 
-/mob/living/carbon/human/RangedAttack(var/atom/A, var/params)
+/mob/living/human/RangedAttack(var/atom/A, var/params)
 	//Climbing up open spaces
 	if(isturf(loc) && bound_overlay && !is_physically_disabled() && istype(A) && A.can_climb_from_below(src))
 		return climb_up(A)

code/_onclick/rig.dm

@@ -25,7 +25,7 @@
 /mob/living/proc/can_use_rig()
 	return 0
 
-/mob/living/carbon/human/can_use_rig()
+/mob/living/human/can_use_rig()
 	return 1
 
 /mob/living/silicon/ai/can_use_rig()

code/controllers/hooks-defs.dm

@@ -37,14 +37,14 @@
 /**
  * Death hook.
  * Called in death.dm when someone dies.
- * Parameters: var/mob/living/carbon/human, var/gibbed
+ * Parameters: var/mob/living/human, var/gibbed
  */
 /hook/death
 
 /**
  * Cloning hook.
  * Called in cloning.dm when someone is brought back by the wonders of modern science.
- * Parameters: var/mob/living/carbon/human
+ * Parameters: var/mob/living/human
  */
 /hook/clone
 

code/controllers/subsystems/initialization/customitems.dm

@@ -41,14 +41,14 @@ SUBSYSTEM_DEF(customitems)
 	. = ..()
 
 // Places the item on the target mob.
-/datum/controller/subsystem/customitems/proc/place_custom_item(mob/living/carbon/human/M, var/datum/custom_item/citem)
+/datum/controller/subsystem/customitems/proc/place_custom_item(mob/living/human/M, var/datum/custom_item/citem)
 	. = M && citem && citem.spawn_item(get_turf(M))
 	if(. && !M.equip_to_appropriate_slot(.) && !M.equip_to_storage(.))
 		to_chat(M, SPAN_WARNING("Your custom item, \the [.], could not be placed on your character."))
 		QDEL_NULL(.)
 
 //gets the relevant list for the key from the listlist if it exists, check to make sure they are meant to have it and then calls the giving function
-/datum/controller/subsystem/customitems/proc/equip_custom_items(mob/living/carbon/human/M)
+/datum/controller/subsystem/customitems/proc/equip_custom_items(mob/living/human/M)
 	var/list/key_list = custom_items_by_ckey[M.ckey]
 	if(!length(key_list))
 		return

code/controllers/subsystems/initialization/misc.dm

@@ -4,6 +4,5 @@ SUBSYSTEM_DEF(misc)
 	flags = SS_NO_FIRE
 
 /datum/controller/subsystem/misc/Initialize()
-	setupgenetics()
 	transfer_controller = new
 	. = ..()

code/controllers/subsystems/jobs.dm

@@ -416,7 +416,7 @@ SUBSYSTEM_DEF(jobs)
 	if(allowed_branches)
 		if(!ishuman(wearer))
 			return FALSE
-		var/mob/living/carbon/human/wearer_human = wearer
+		var/mob/living/human/wearer_human = wearer
 		if(!wearer_human.char_branch || !(wearer_human.char_branch.type in allowed_branches))
 			return FALSE
 	if(allowed_skills)
@@ -427,7 +427,7 @@ SUBSYSTEM_DEF(jobs)
 		return FALSE
 	return TRUE
 
-/datum/controller/subsystem/jobs/proc/equip_custom_loadout(var/mob/living/carbon/human/H, var/datum/job/job)
+/datum/controller/subsystem/jobs/proc/equip_custom_loadout(var/mob/living/human/H, var/datum/job/job)
 
 	if(!H || !H.client)
 		return
@@ -463,7 +463,7 @@ SUBSYSTEM_DEF(jobs)
 
 	return spawn_in_storage
 
-/datum/controller/subsystem/jobs/proc/equip_job_title(var/mob/living/carbon/human/H, var/job_title, var/joined_late = 0)
+/datum/controller/subsystem/jobs/proc/equip_job_title(var/mob/living/human/H, var/job_title, var/joined_late = 0)
 	if(!H)
 		return