diff --git a/code/datums/diseases/jungle_fever.dm b/code/datums/diseases/jungle_fever.dm index 72e218a28f9..31769dad902 100644 --- a/code/datums/diseases/jungle_fever.dm +++ b/code/datums/diseases/jungle_fever.dm @@ -4,7 +4,9 @@ cure = "None" spread = "Bites" spread_type = SPECIAL - affected_species = list("Monkey") + affected_species = list("Monkey", "Human") curable = 0 desc = "Monkies with this disease will bite humans, causing humans to spontaneously mutate into a monkey." severity = "Medium" + //stage_prob = 100 + agent = "Kongey Vibrion M-909" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 774a80f6b0c..1368c848745 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -31,20 +31,25 @@ O.dna = src.dna src.dna = null O.dna.uni_identity = "00600200A00E0110148FC01300B009" - O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" + //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" + O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*13)]BB8" + O.loc = src.loc + O.virus = src.virus + src.virus = null + if (O.virus) + O.virus.affected_mob = O if (src.client) src.client.mob = O - O.loc = src.loc O.a_intent = "hurt" O << "You are now a monkey." - - del(src) - return + var/prev_body = src + src = null //prevent terminating proc due to folowing del() + del(prev_body) + return O /mob/new_player/AIize() src.spawning = 1 - ..() - return + return ..() /mob/living/carbon/AIize() if (src.monkeyizing) @@ -67,7 +72,7 @@ del(src.organs[text("[]", t)]) - ..() + return ..() /mob/proc/AIize() diff --git a/code/unused/gamemodes/monkey.dm b/code/unused/gamemodes/monkey.dm index 5df1b06f337..49228c25ead 100644 --- a/code/unused/gamemodes/monkey.dm +++ b/code/unused/gamemodes/monkey.dm @@ -27,6 +27,7 @@ for (var/mob/living/carbon/monkey/rabid_monkey in world) rabid_monkey.contract_disease(new /datum/disease/jungle_fever,0,0) + rabid_monkey << "Your goal is to capture the entire human civilization and your first target is Centcom. Hijack the shuttle without humans aboard." /datum/game_mode/monkey/check_finished() if(emergency_shuttle.location==2) @@ -55,13 +56,17 @@ break if (monkeywin) - world << "The monkies have won!" + world << "The monkeys have won! Humanity is doomed!" + for (var/mob/living/carbon/human/player in world) + if (player.client) + spawn(0) + player.monkeyize() for(var/mob/living/carbon/monkey/monkey_player in world) if (monkey_player.client) world << "[monkey_player.key] was a monkey." - + sleep(50) else - world << "The Research Staff has stopped the monkey invasion!" + world << "The Research Staff has stopped the monkey invasion!" for(var/mob/living/carbon/monkey/monkey_player in world) if (monkey_player.client) world << "[monkey_player.key] was a monkey."