Небольшие изменения в вирусологии

baystation12.dme

@@ -3444,6 +3444,7 @@
 #include "mods\_master_files\code\modules\events\gravity.dm"
 #include "mods\_master_files\code\modules\maps\map_template.dm"
 #include "mods\_master_files\code\modules\mob\living\life.dm"
+#include "mods\_master_files\code\modules\mob\living\carbon\viruses.dm"
 #include "mods\_master_files\code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
 #include "mods\_master_files\code\modules\multiz\turf.dm"

mods/_master_files/code/modules/mob/living/carbon/viruses.dm

@@ -0,0 +1,5 @@
+
+/mob/living/carbon/virus_immunity()
+	if(reagents)
+		var/antibiotic_boost = reagents.get_reagent_amount(/datum/reagent/spaceacillin) / (REAGENTS_OVERDOSE/2)
+		return max(immunity/100 * (1+antibiotic_boost), antibiotic_boost)

mods/virusology/code/disease2.dm

@@ -69,7 +69,7 @@ LEGACY_RECORD_STRUCTURE(virus_records, virus_record)
 		return
 
 	if(stage <= 1 && clicks == 0) 	// with a certain chance, the mob may become immune to the disease before it starts properly
-		if(prob(mob.virus_immunity() * 0.05))
+		if(prob(mob.virus_immunity() * 0.025))
 			cure(mob, 1)
 			return
 
@@ -88,7 +88,7 @@ LEGACY_RECORD_STRUCTURE(virus_records, virus_record)
 		cure(mob,1)
 	//Waiting out the disease the old way
 	if(stage == max_stage && clicks > max(stage*100, 300))
-		if(prob(mob.virus_immunity() * 0.05 + 100-infectionchance))
+		if(prob(mob.virus_immunity() * 0.5))
 			cure(mob, 1)
 
 	var/top_badness = 1

mods/virusology/code/effect.dm

@@ -183,8 +183,75 @@
 		mob.emote("cough")
 		to_chat(mob, "<span class='warning'>You cough up the [S]!</span>")
 
+
+/datum/disease2/effect/zombie
+	name = "Corruption Syndrome"
+	stage = 4
+	badness = VIRUS_EXOTIC
+	chance_max = 80
+	delay = 20 SECONDS
+	var/first_message_shown = FALSE
+	var/time_of_first_tick = 0
+	var/total_trasformation = 0
+	var/time_to_trasform = 5 MINUTES
+
+
+/datum/disease2/effect/zombie/activate(mob/living/carbon/human/mob, multiplier)
+	if(mob.is_species(SPECIES_ZOMBIE))
+		return
+	if(!first_message_shown)
+		first_message_shown = TRUE
+		time_of_first_tick = world.time
+		total_trasformation = time_of_first_tick + time_to_trasform
+		to_chat(mob, "<span class='notice'>You feel as something hungry is woke up inside you!</span>")
+	if(prob(50))
+		to_chat(mob, "<span class='warning'>You feel uncontrollable rage filling you! Your hunger is killing you! You want to eat!</span>")
+		if (mob.reagents.get_reagent_amount(/datum/reagent/hyperzine) < 10)
+			mob.reagents.add_reagent(/datum/reagent/hyperzine, 4)
+			mob.adjust_nutrition(-50)
+	if(prob(50) && mob.check_has_mouth())//go crazy and bite someone
+		var/list/mouth_status = mob.can_eat_status()
+		if (mouth_status[1] == 1)//if no mouth HUMAN_EATING_NBP_MOUTH
+			to_chat(mob, "<span class='warning'>You angrily attempt to bite someone but you can't without a mouth!</span>")
+			return
+		if (mouth_status[1] == 2)//if something covers mouth HUMAN_EATING_BLOCKED_MOUTH
+			to_chat(mob, "<span class='warning'>You angrily chew \the [mouth_status[2]] covering your mouth!</span>")
+			return
+		var/list/mobs_to_bite = list()
+		for (var/mob/living/carbon/L in range(1))
+			if (L == mob)
+				continue
+			mobs_to_bite += L
+		if (LAZYLEN(mobs_to_bite) < 1)//nobody to bite
+			return
+		var/mob/living/Target = pick(mobs_to_bite)
+		mob.visible_message("<span class='warning'>[mob] violently bites [Target]!</span>")
+		Target.adjustBruteLoss(5)
+		if (prob(50))
+			infect_virus2(Target, src, 1)
+	if(total_trasformation)
+		var/time_left = total_trasformation - world.time
+		var/transform_chance = (time_left/total_trasformation)*100
+		if(prob(100-transform_chance))
+			mob.zombify()
+
 ////////////////////////STAGE 3/////////////////////////////////
 
+/datum/disease2/effect/hiv
+	name = "Immunodeficiency"
+	stage = 3
+	multiplier_max = 3
+	chance = 50
+	chance_max = 100
+	badness = VIRUS_COMMON
+/datum/disease2/effect/hiv/activate(mob/living/carbon/human/mob)
+	mob.immunity -= 30
+	mob.immunity_norm -= 15
+
+/datum/disease2/effect/hiv/deactivate(mob/living/carbon/human/mob)
+	mob.immunity_norm = 100
+
+
 /datum/disease2/effect/toxins
 	name = "Hyperacidity"
 	stage = 3

mods/virusology/code/helpers.dm

@@ -100,7 +100,7 @@
 	var/list/antibodies_in_common = M.antibodies & disease.antigen
 	if(LAZYLEN(antibodies_in_common))
 		return
-	if(prob(100 * M.reagents.get_reagent_amount(/datum/reagent/spaceacillin) / (REAGENTS_OVERDOSE/2)))
+	if(M.reagents && prob(100 * M.reagents.get_reagent_amount(/datum/reagent/spaceacillin) / (REAGENTS_OVERDOSE/2)))
 		return
 
 	if(!LAZYLEN(disease.affected_species))

mods/virusology/code/human_process.dm

@@ -45,6 +45,8 @@
 	if(life_tick % 5 && immunity < 15 && chem_effects[CE_ANTIVIRAL] < VIRUS_COMMON && !LAZYLEN(virus2))
 		var/infection_prob = 5 - immunity
 		var/turf/simulated/T = get_turf(src)
+		if(istype(T,/turf/space))
+			return
 		if(istype(T))
 			infection_prob += T.dirt
 		if(T.dirt >= 50)

mods/virusology/code/pre_made_viruses.dm

@@ -119,3 +119,123 @@
 	E4.chance = 2
 	effects += E4
 	E4.multiplier = rand(1,E4.multiplier_max)
+
+
+
+
+/datum/disease2/disease/zombie
+
+	infectionchance = 80
+	speed = 8
+	spreadtype = "Contact"
+	max_stage = 4
+	affected_species = list(HUMAN_SPECIES,SPECIES_TAJARA,SPECIES_RESOMI,SPECIES_MONKEY,SPECIES_SPACER,SPECIES_GRAVWORLDER,SPECIES_VATGROWN,SPECIES_VOX,SPECIES_FARWA,SPECIES_MULE,SPECIES_STOK,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_YEOSA,SPECIES_TRITONIAN,SPECIES_RESOMI,SPECIES_MONKEY,SPECIES_ZOMBIE)
+
+
+/datum/disease2/disease/zombie/New()
+	..()
+	antigen = list(pick(ALL_ANTIGENS))
+	antigen |= pick(ALL_ANTIGENS)
+	infectionchance = rand(50,100)
+	var/datum/disease2/effect/gunck/E1 = new()
+	E1.stage = 1
+	E1.chance = 20
+	effects += E1
+	E1.multiplier = rand(1,E1.multiplier_max)
+	var/datum/disease2/effect/hungry/E2 = new()
+	E2.stage = 2
+	E2.chance = 25
+	effects += E2
+	E2.multiplier = rand(1,E2.multiplier_max)
+	var/datum/disease2/effect/hiv/E3 = new()
+	E3.stage = 3
+	E3.chance = 50
+	effects += E3
+	E3.multiplier = rand(3,E3.multiplier_max)
+	var/datum/disease2/effect/zombie/E4 = new()
+	E4.stage = 4
+	E4.chance = 80
+	effects += E4
+	E4.multiplier = rand(1,E4.multiplier_max)
+
+
+////////ЕСЛИ ЗАХОТИМ НА ДЕРЕЛИКТ ДЕЛАТЬ СИМПЛМОБОВ ЗАРАЖЕННЫХ ВИРУСОМ ЗОМБЕЙ, ТО СЮДА ПРОПИСЫВАЕМ ИХ, САМ ПРЕМЕЙД ЕСТЬ ВЫШЕ/////
+
+/// ПРЯМ СЮДА 	^
+//				|
+
+/mob/living/carbon/human/zombify()
+	if (!(species.name in GLOB.zombie_species) || is_species(SPECIES_DIONA) || is_zombie() || isSynthetic())
+		return
+
+	adjustHalLoss(100)
+	adjustBruteLoss(50)
+	make_jittery(300)
+
+	var/turf/T = get_turf(src)
+	new /obj/decal/cleanable/vomit(T)
+	playsound(T, 'sound/effects/splat.ogg', 20, 1)
+
+	var/obj/item/held_l = get_equipped_item(slot_l_hand)
+	var/obj/item/held_r = get_equipped_item(slot_r_hand)
+	if(held_l)
+		drop_from_inventory(held_l)
+	if(held_r)
+		drop_from_inventory(held_r)
+	if(prob(70))
+		addtimer(new Callback(src, PROC_REF(transform_zombie)), 20)
+	else
+		addtimer(new Callback(src, PROC_REF(transform_zombie_smart)), 20)
+
+
+/singleton/species/zombie/handle_post_spawn(mob/living/carbon/human/H)
+	. = ..()
+	var/datum/disease2/disease/zombie = new()
+	natural_armour_values = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		bomb = ARMOR_BOMB_PADDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_RESISTANT
+		)
+	infect_virus2(H, zombie, 1)
+	H.immunity = 10
+	H.immunity_norm = 10
+
+
+/singleton/species/zombie/handle_environment_special(mob/living/carbon/human/H)
+	var/datum/disease2/disease/zombie = new()
+	if (H.stat == CONSCIOUS)
+		if (prob(5))
+			playsound(H.loc, 'sound/hallucinations/far_noise.ogg', 15, 1)
+		else if (prob(5))
+			playsound(H.loc, 'sound/hallucinations/veryfar_noise.ogg', 15, 1)
+		else if (prob(5))
+			playsound(H.loc, 'sound/hallucinations/wail.ogg', 15, 1)
+
+	if (H.stat != DEAD)
+		for(var/obj/item/organ/organ in (H.organs + H.internal_organs))
+			if (organ.damage > 0)
+				organ.heal_damage(heal_rate, heal_rate, 1)
+		if (H.getToxLoss())
+			H.adjustToxLoss(-heal_rate)
+		if (prob(5))
+			H.resuscitate()
+		H.vessel.add_reagent(/datum/reagent/blood, min(heal_rate * 20, blood_volume - H.vessel.total_volume))
+
+	else
+		var/list/victims = ohearers(rand(1, 2), H)
+		for(var/mob/living/carbon/human/M in victims) // Post-mortem infection
+			if (H == M || M.is_zombie())
+				continue
+			if (M.isSynthetic() || M.is_species(SPECIES_DIONA) || !(M.species.name in GLOB.zombie_species))
+				continue
+			if (M.wear_mask && (M.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) // If they're protected by a mask
+				continue
+			if (M.head && (M.head.item_flags & ITEM_FLAG_AIRTIGHT)) // If they're protected by a helmet
+				continue
+
+			var/vuln = 1 - M.get_blocked_ratio(BP_HEAD, DAMAGE_TOXIN, damage_flags = DAMAGE_FLAG_BIO) // Are they protected by hazmat clothing?
+			if (vuln > 0.10 && prob(8))
+				infect_virus2(H, zombie, 1)