add:Leg paralysis (ss220-space#5827)

* bugfix * 12312321 * Revert "12312321" This reverts commit 1d87a2f. * Revert "bugfix" This reverts commit 790176b. * szfdsfsdfds * asdfasdfas * adfafyresh * convert to TRAIT_FLOORED * blacklisted_disabilities * аывыав * А тут надо писать просто примерное название? * do what Zwei want * del trait_nolegs, change disab flag name * 2.0 * dsfdssd * change name 2.0 * fdsdsf * dsfhgdfgdf
NULL882 · Sep 7, 2024 · 207c0ea · 207c0ea
1 parent 2248b9d
commit 207c0ea
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
@@ -25,6 +25,7 @@
 #define DISABILITY_FLAG_TEA_ADDICT (1<<13)
 #define DISABILITY_FLAG_ALCOHOLE_ADDICT (1<<14)
 #define DISABILITY_FLAG_NICOTINE_ADDICT (1<<15)
+#define DISABILITY_FLAG_PARAPLEGIA 		  (1<<16)
 
 
 //Nutrition levels for humans. No idea where else to put it

diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
@@ -45,6 +45,7 @@ GLOBAL_VAR_INIT(scrambleblock, 0)
 GLOBAL_VAR_INIT(weakblock, 0)
 GLOBAL_VAR_INIT(hornsblock, 0)
 GLOBAL_VAR_INIT(comicblock, 0)
+GLOBAL_VAR_INIT(paraplegiablock, 0)
 
 // Powers
 GLOBAL_VAR_INIT(soberblock, 0)
@@ -74,5 +75,4 @@ GLOBAL_VAR_INIT(fakeblock1, 0)
 GLOBAL_VAR_INIT(fakeblock2, 0)
 GLOBAL_VAR_INIT(fakeblock3, 0)
 GLOBAL_VAR_INIT(fakeblock4, 0)
-GLOBAL_VAR_INIT(fakeblock5, 0)
 
diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
@@ -373,3 +373,14 @@
 			mutant.physiology.punch_damage_low += 2
 			mutant.physiology.punch_damage_high += 3
 
+/datum/dna/gene/disability/paraplegia
+	name = "Paraplegia"
+	desc = "Парализует мышцы ног."
+	activation_message = "Вы не чуствуете своих ног."
+	deactivation_message = "Вы возвращаете контроль над ногами."
+	instability = -GENE_INSTABILITY_MAJOR
+	traits_to_add = list(TRAIT_FLOORED)
+
+/datum/dna/gene/disability/paraplegia/New()
+	..()
+	block = GLOB.paraplegiablock
diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm
@@ -180,7 +180,3 @@
 	..()
 	block = GLOB.fakeblock4
 
-
-/datum/dna/gene/basic/fake/fake5/New()
-	..()
-	block = GLOB.fakeblock5
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
@@ -47,7 +47,6 @@
 	GLOB.fakeblock2				= getAssignedBlock("", numsToAssign)
 	GLOB.fakeblock3				= getAssignedBlock("", numsToAssign)
 	GLOB.fakeblock4				= getAssignedBlock("", numsToAssign)
-	GLOB.fakeblock5				= getAssignedBlock("", numsToAssign)
 
 	// Bay muts
 	GLOB.breathlessblock		= getAssignedBlock("BREATHLESS", numsToAssign,		DNA_HARD_BOUNDS,		good = TRUE)
@@ -100,6 +99,7 @@
 
 	// Paradise1984 Disabilities
 	GLOB.auld_imperial_block	= getAssignedBlock("AULD_IMPERIAL", numsToAssign)
+	GLOB.paraplegiablock		= getAssignedBlock("PARAPLEGIA", numsToAssign)
 
 	//
 	// Static Blocks

diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
@@ -1184,6 +1184,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 		HTML += ShowDisabilityState(user, DISABILITY_FLAG_COFFEE_ADDICT, "Coffee addict")
 	if(!(S.blacklisted_disabilities & DISABILITY_FLAG_ALCOHOLE_ADDICT))
 		HTML += ShowDisabilityState(user, DISABILITY_FLAG_ALCOHOLE_ADDICT, "Alcohole addict")
+	if(!(S.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA))
+		HTML += ShowDisabilityState(user, DISABILITY_FLAG_PARAPLEGIA, "Paraplegia")
 
 	HTML += {"</ul>
 		<a href=\"?_src_=prefs;task=close;preference=disabilities\">\[Done\]</a>
@@ -2867,7 +2869,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 	// Wheelchair necessary?
 	var/obj/item/organ/external/l_foot = character.get_organ(BODY_ZONE_PRECISE_L_FOOT)
 	var/obj/item/organ/external/r_foot = character.get_organ(BODY_ZONE_PRECISE_R_FOOT)
-	if(!l_foot && !r_foot)
+	if(!l_foot && !r_foot || HAS_TRAIT_FROM(character, TRAIT_FLOORED, DNA_TRAIT))
 		var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(character.loc)
 		W.buckle_mob(character, TRUE)
 
@@ -2957,6 +2959,9 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
 	if((disabilities & DISABILITY_FLAG_WINGDINGS) && !(new_species.blacklisted_disabilities & DISABILITY_FLAG_WINGDINGS))
 		character.force_gene_block(GLOB.wingdingsblock, TRUE, TRUE)
 
+	if((disabilities & DISABILITY_FLAG_PARAPLEGIA) && !(new_species.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA))
+		character.force_gene_block(GLOB.paraplegiablock, TRUE, TRUE)
+
 	character.dna.species.handle_dna(character)
 
 	if(character.dna.dirtySE)

diff --git a/code/modules/economy/quests/thing_quests.dm b/code/modules/economy/quests/thing_quests.dm
@@ -485,6 +485,7 @@
 		"WEAK" = 150,
 		"HORNS" = 150,
 		"COMIC" = 150,
+		"PARAPLEGIA" = 150,
 	)
 
 	hard_items = list(