From 58186ce7e0e9c6605ef4e45f8ad8b6826ff82607 Mon Sep 17 00:00:00 2001 From: cib Date: Sat, 9 Mar 2013 10:35:20 +0100 Subject: [PATCH 1/3] Improved brainloss effects. - Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss. - Removed stupid effects, like random messages and headbutting airlocks. - Cloning now will leave you at lower health and cause small amounts of brainloss. --- code/game/machinery/cloning.dm | 6 ++--- code/modules/mob/living/carbon/human/life.dm | 22 ++++++++++++++++++- icons/obj/cryobag.dmi | Bin 0 -> 373 bytes 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index fd54da9de19..8c22b202eb9 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -133,7 +133,7 @@ return 0 - src.heal_level = rand(60,100) //Randomizes what health the clone is when ejected + src.heal_level = rand(10,40) //Randomizes what health the clone is when ejected src.attempting = 1 //One at a time!! src.locked = 1 @@ -150,8 +150,8 @@ src.icon_state = "pod_1" //Get the clone body ready - H.adjustCloneLoss(src.heal_level + 100) //new damage var so you can't eject a clone early then stab them to abuse the current damage system --NeoFite - H.adjustBrainLoss(heal_level) + H.adjustCloneLoss(150) //new damage var so you can't eject a clone early then stab them to abuse the current damage system --NeoFite + H.adjustBrainLoss(src.heal_level + 50 + rand(10, 30)) // The rand(10, 30) will come out as extra brain damage H.Paralyse(4) //Here let's calculate their health so the pod doesn't immediately eject them!!! diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 63931927e84..923e75ade4e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -261,7 +261,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if (disabilities & NERVOUS) if (prob(10)) stuttering = max(10, stuttering) - if (getBrainLoss() >= 60 && stat != 2) + // No. -- cib + /*if (getBrainLoss() >= 60 && stat != 2) if (prob(3)) switch(pick(1,2,3)) if(1) @@ -270,6 +271,25 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!")) if(3) emote("drool") + */ + + if(stat != 2) + var/rn = rand(0, 200) + if(getBrainLoss() >= 5) + if(0 <= rn && rn <= 3) + custom_pain("Your head feels numb and painful.") + if(getBrainLoss() >= 15) + if(4 <= rn && rn <= 6) if(eye_blurry <= 0) + src << "\red It becomes hard to see for some reason." + eye_blurry = 10 + if(getBrainLoss() >= 35) + if(7 <= rn && rn <= 9) if(hand && equipped()) + src << "\red Your hand won't respond properly, you drop what you're holding." + drop_item() + if(getBrainLoss() >= 50) + if(10 <= rn && rn <= 12) if(!lying) + src << "\red Your legs won't respond properly, you fall down." + lying = 1 proc/handle_organs() // take care of organ related updates, such as broken and missing limbs diff --git a/icons/obj/cryobag.dmi b/icons/obj/cryobag.dmi index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..116a2c44d1699e5fb04180ee3d79ccc94d6e99f1 100644 GIT binary patch literal 373 zcmV-*0gC>KP)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjODN%>?;vRDP=QLleuLXN0-N5AgR+L+ zSZaQ5NUXz1?8~7gNGvn46!V!{Pi?+MNN`Rp%Vz+>H3d$P#0h+fM3zl+5 zLI3~&$4Nv%R9J=WmfH=(APhxK)s5l-JW@u4n#*GluanaIniE;ayi`WDYS|Q5j$F?1D zl?-dz5myPKxdXK=J!5Qk80I6JSgLsRW;uRs%!; z0RIx4RShF%4mo@5 TSn_%=00000NkvXXu0mjfa;=r7 literal 0 HcmV?d00001 From 55936a3e966e78f56ca120ff2d6c6059d06909e3 Mon Sep 17 00:00:00 2001 From: cib Date: Sat, 9 Mar 2013 10:40:32 +0100 Subject: [PATCH 2/3] Forgot to save airlock.dm before committing. --- code/game/machinery/doors/airlock.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 8db6aa50b73..935cae8240f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -847,6 +847,8 @@ About the new airlock wires panel: if(src.shock(user, 100)) return + // No. -- cib + /** if(ishuman(user) && prob(40) && src.density) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) @@ -861,6 +863,7 @@ About the new airlock wires panel: else visible_message("\red [user] headbutts the airlock. Good thing they're wearing a helmet.") return + **/ if(src.p_open) user.set_machine(src) From db707b4e5b328ed21d74f6b8545506804b6685f3 Mon Sep 17 00:00:00 2001 From: cib Date: Sat, 9 Mar 2013 14:29:48 +0100 Subject: [PATCH 3/3] Headrevs now get the names of 3 people who might be convertible. --- code/game/gamemodes/revolution/rp_revolution.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 296792808d1..2159138448a 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -78,6 +78,17 @@ rev_mind.special_role = "Head Revolutionary" obj_count++ + // Show each head revolutionary up to 3 candidates + var/list/already_considered = list() + for(var/i = 0, i < 2, i++) + var/mob/rev_mob = rev_mind.current + already_considered += rev_mob + // Tell them about people they might want to contact. + var/mob/living/carbon/human/M = get_nt_opposed() + if(M && !(M.mind in head_revolutionaries) && !(M in already_considered)) + rev_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them." + rev_mob.mind.store_memory("Potential Collaborator: [M.real_name]") + /////////////////////////////////////////////////// //Deals with converting players to the revolution// ///////////////////////////////////////////////////