diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index a7e8e4b230a..14f35c3e45c 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -75,6 +75,24 @@ datum/controller/vote choices[master_mode] += non_voters if(choices[master_mode] >= greatest_votes) greatest_votes = choices[master_mode] + else if(mode == "crew_transfer") + var/factor = 0.5 + switch(world.time / (10 * 60)) // minutes + if(0 to 60) + factor = 0.5 + if(61 to 120) + factor = 0.8 + if(121 to 240) + factor = 1 + if(241 to 300) + factor = 1.2 + else + factor = 1.4 + choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) + world << "Crew Transfer Factor: [factor]" + greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) + + //get all options with that many votes and return them in a list . = list() if(greatest_votes) diff --git a/code/datums/organs/pain.dm b/code/datums/organs/pain.dm index 820ef5a077c..0b9158eff12 100644 --- a/code/datums/organs/pain.dm +++ b/code/datums/organs/pain.dm @@ -87,4 +87,23 @@ mob/living/carbon/human/proc/handle_pain() var/datum/organ/internal/I = internal_organs[organ_name] if(I.damage > 2) if(prob(2)) var/datum/organ/external/parent = get_organ(I.parent_organ) - src.custom_pain("You feel a sharp pain in your [parent.display_name]", 1) \ No newline at end of file + src.custom_pain("You feel a sharp pain in your [parent.display_name]", 1) + + var/toxDamageMessage = null + var/toxMessageProb = 1 + switch(getToxLoss()) + if(1 to 5) + toxMessageProb = 1 + toxDamageMessage = "Your body stings slightly." + if(6 to 10) + toxMessageProb = 2 + toxDamageMessage = "Your whole body hurts a little." + if(11 to 15) + toxMessageProb = 2 + toxDamageMessage = "Your whole body hurts." + else + toxMessageProb = 5 + toxDamageMessage = "Your body aches all over, it's driving you mad." + + if(toxDamageMessage && prob(toxMessageProb)) + src.custom_pain(toxDamageMessage, getToxLoss() >= 15) \ No newline at end of file