forgor

yogstation13 · Oct 15, 2023 · 5057f42 · 5057f42
1 parent 7919885
commit 5057f42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
@@ -372,6 +372,12 @@ Key procs
 	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 							/datum/language/felinid = list(LANGUAGE_ATOM))
 
+/datum/language_holder/darkspawn
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/darkspawn = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/darkspawn = list(LANGUAGE_ATOM))
+
 /datum/language_holder/spiderbot
 	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 								/datum/language/felinid = list(LANGUAGE_ATOM), ///Spiderbots, I am sorry for making you understand this shit

diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -15,11 +15,11 @@
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
 
 	mutanteyes = /obj/item/organ/eyes/night_vision
+	species_language_holder = /datum/language_holder/darkspawn
 	var/powerful_heal = FALSE
 	var/dark_healing = 1
 	var/light_burning = 1
 
-
 /datum/species/shadow/spec_life(mob/living/carbon/human/H)
 	H.bubble_icon = "darkspawn"
 	var/turf/T = H.loc
@@ -168,7 +168,6 @@
 	shadow_charges = 3
 	dark_healing = 5
 	light_burning = 7
-	//owner.current.remove_language(/datum/language/darkspawn)
 
 /datum/species/shadow/darkspawn/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
 	if(prob(50) && shadow_charges > 0)
@@ -207,7 +206,8 @@
 /datum/species/shadow/darkspawn/spec_death(gibbed, mob/living/carbon/human/H)
 	playsound(H, 'yogstation/sound/creatures/darkspawn_death.ogg', 50, FALSE)
 
-
+/datum/species/shadow/darkspawn/check_roundstart_eligible()
+	return FALSE
 /////////////////////////////Organs/////////////////////////////////////
 /obj/item/organ/brain/nightmare
 	name = "tumorous mass"

diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
@@ -35,7 +35,6 @@
 	var/specialization = NONE
 
 // Antagonist datum things like assignment //
-
 /datum/antagonist/darkspawn/on_gain()
 	SSticker.mode.darkspawn += owner
 	owner.special_role = "darkspawn"
@@ -92,7 +91,6 @@
 		return "<span class='redtext big'>The darkspawn have failed!</span><br>"
 
 //Admin panel stuff
-
 /datum/antagonist/darkspawn/antag_panel_data()
 	. = "<b>Upgrades:</b><br>"
 	for(var/V in upgrades)