From 856950caa82eda38e06b9fbda6b65503b35d8b59 Mon Sep 17 00:00:00 2001 From: "Robert (Hopek)" Date: Mon, 14 Oct 2019 19:39:23 -0500 Subject: [PATCH 1/6] Revert "Restoring my main branch" This reverts commit 39cb2325420652af5edf2ccda8ebcd306a611d16. --- .../chemistry/reagents/medicine_reagents.dm | 147 ++++++++++++++++++ .../reagents/chemistry/recipes/medicine.dm | 24 +++ 2 files changed, 171 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index eb5303bf8dbe..a5a978b8d624 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1335,5 +1335,152 @@ ..() . = 1 +/datum/reagent/medicine/burnmix + name = "BurnMix" + description = "Take in moderation. Heals damage at a snail's pace. Effects increase when used with Epinephrine or Perfluorodecalin. You don't want this in your body for longer than needed." + reagent_state = LIQUID + color = "#BD328A" // R 189 G 50 B 138 , Medium Red Violet , Hue of Violet + overdose_threshold = 12 + taste_description = "dixel" + glass_name = "glass of ...red?" + glass_desc = "Looks like some chunky dark red mix." + reagent_weight = 4 + addiction_threshold = 40 + // Max healing non OD with best rolls + buffs: 0.2 + 0.15 + 0.2 = 0.55 + // Max healing with OD + best rolls and all buffs: 0.4 + 0.35 + 0.4 = 1.15 + +/datum/reagent/medicine/burnmix/on_mob_life(mob/living/carbon/M) + var/heal_roll = pick(-0.1,-0.2) // Base heal, Non OD + var/slur = 10 // Slur 10 sets up for future slur gains as real effects seem to start at 30 + var/jitter = 0 + if(M.health <= M.crit_threshold) + heal_roll = 0 // Burnmix will not heal anyone inside of crit without epipen or morhpine + if(prob(10)) + heal_roll = 0 // Burnmix has a chance not to basic heal at all + if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) // start IF has Epinephrine in body + jitter = jitter + 5 + slur = slur + 25 + heal_roll = heal_roll - 0.15 + if(prob(15)) + M.losebreath++ + if(prob(80)) + M.adjustStaminaLoss(1.25*REM, 0) // end IF has Epinephrine in body + + if(holder.has_reagent(/datum/reagent/medicine/perfluorodecalin)) // start IF has Perfluorodecalin in body + jitter = jitter + 5 + slur = slur + 25 + M.drowsyness += 0.5 + heal_roll = heal_roll - 0.2 // start IF has Perfluorodecalin in body + + if(prob(10)) // Start of base probability effects + var/tox_roll = pick(1,-1) // Rolls for damage or healing + if(tox_roll == 1) + M.emote("moan") + if(tox_roll == -1) + M.emote("twitch") + if(prob(90)) + M.adjustToxLoss(tox_roll*REM, 0) + M.Jitter(jitter) + if(prob(1)) // Last set of non OD probability effects + M.Dizzy(jitter) + M.slurring = slur // End of base probability effects + if(heal_roll < 0) // Healing payload after calculations + if (M.stat == DEAD) // Non OD , if dead , 30% chance to discard healing payload + if(prob(70)) + M.adjustFireLoss(heal_roll*REM, FALSE, FALSE, BODYPART_ORGANIC) + M.adjustBruteLoss(heal_roll*REM, 0) + else + M.adjustFireLoss(heal_roll*REM, 0) + M.adjustBruteLoss(heal_roll*REM, 0) + ..() + . = 1 + +/datum/reagent/drug/burnmix/overdose_start(mob/living/M) + to_chat(M, "You feel the BurnMix increase in potency.") + + +/datum/reagent/medicine/burnmix/overdose_process(mob/living/M) + var/heal_roll = pick(-0.2,-0.4) + var/slur = 20 + var/jitter = 2 + if(M.health <= M.crit_threshold) + heal_roll = heal_roll + 0.2 // Burnmix in overdose will heal inside of crit without epipen or perfluorodecalin. Being in crit means a roll for either no base healing or half reduction to base heal. + if(heal_roll > 0 && prob(10)) + heal_roll = 0 // Burnmix has a chance not to basic heal at all + if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) + heal_roll = heal_roll - 0.35 + jitter = jitter + 15 + slur = slur + 25 + if(prob(25)) + M.losebreath++ + M.adjustStaminaLoss(2.5*REM, 0) + if(prob(80)) + M.adjustToxLoss(0.5*REM, 0) + M.adjustToxLoss(pick(0,-0.25), 0) // gives a chance to negate half epinephrine tox damage + + if(holder.has_reagent(/datum/reagent/medicine/perfluorodecalin)) + heal_roll = heal_roll - 0.4 + jitter = jitter + 15 + slur = slur + 25 + if(prob(25)) + M.adjustToxLoss(0.5*REM, 0) + M.adjustToxLoss(pick(0,-0.25), 0) // gives a chance to negate half perfluorodecalin tox damage + + if(holder.has_reagent(holder.has_reagent(/datum/reagent/medicine/epinephrine) && /datum/reagent/medicine/perfluorodecalin)) // start IF both drugs present + if(prob(0.5)) // Should be 1 in 200 chance of a 1 in 3 chance to roll for faint if both epinephrine and perfluorodecalin are present + M.emote((pick("scream","faint","gasp"))) + if(prob(60)) // Original edit did too much brain damage. Moved to both drug effects. Was default OD effect + M.adjustOrganLoss(ORGAN_SLOT_BRAIN,pick(1,-1)) + if(prob(30)) + slur = slur + 25 + if(prob(30)) + jitter = 50 + if(prob(30)) + M.drowsyness += 0.5 + if(prob(2)) + to_chat(M, "Your fingers spasm!") + M.drop_all_held_items() // end IF both drugs present + + if(prob(40)) // start last set of OD probability effects + M.emote(pick("twitch","drool","moan","giggle","spin")) + if(prob(60)) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, pick(0,1,2,2.5,-1,-2)) + if(prob(15)) + M.set_drugginess(pick(2,4,6)) + M.Jitter(jitter) + if(prob(40)) + M.adjustToxLoss(pick(1,-1)*REM, 0) + if(prob(1)) + M.Dizzy(jitter) // end last set of OD probability effects + M.Jitter(jitter) // OD slur and jitter after calculations + M.slurring = slur + if(heal_roll < 0) // OD Healing payload after calculations + M.adjustFireLoss(heal_roll*REM, FALSE, FALSE, BODYPART_ORGANIC) + M.adjustBruteLoss(heal_roll*REM, 0) + ..() + . = 1 + +/datum/reagent/medicine/burnmix/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) + if(iscarbon(M)) + if (M.stat == DEAD) // If the mob is dead and you apply it via touch. You get to play an RNG healing game. + if(method in list(PATCH, TOUCH)) + var/RNG_ROLL = pick(-0.5,-0.25,-0.1,0,0.2) + var/RNG_TEXT = "no effect" + if(RNG_ROLL == -0.5) + RNG_TEXT = "had a great effect" + if(RNG_ROLL == -0.25) + RNG_TEXT = "had a good effect" + if(RNG_ROLL == -0.1) + RNG_TEXT = "had a somewhat good effect" + if(RNG_ROLL == 0.2) + RNG_TEXT = "made things worse!" + if(RNG_ROLL != 0) + SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) + M.adjustBruteLoss(RNG_ROLL*reac_volume) + M.adjustFireLoss(RNG_ROLL*reac_volume) + M.visible_message("[M]'s body reacts with the Burnmix. It seemed to have [RNG_TEXT]!") + ..() + + #undef PERF_BASE_DAMAGE diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 003e60804339..2fbaaf0eef75 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -264,3 +264,27 @@ id = /datum/reagent/medicine/psicodine results = list(/datum/reagent/medicine/psicodine = 5) required_reagents = list( /datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1) + +/datum/chemical_reaction/burnmix // Chemistry recipe + name = "BurnMix" + required_temp = 700 + id = /datum/reagent/medicine/burnmix + mix_message = "The solution boils, binding the remaining ingredients." + results = list(/datum/reagent/medicine/burnmix = 2) + required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, /datum/reagent/iron = 1) + +/datum/chemical_reaction/burnmix2 // Ghetto recipe + name = "BurnMix" + id = /datum/reagent/medicine/burnmix + required_temp = 500 + mix_message = "The solution bubbles, binding the ingredients." + results = list(/datum/reagent/medicine/burnmix = 3) // Fuel burns away to form BurnMix from Nutriment and ash + required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/ash = 2) // Some welding fluid, any food and ash (burn some paper) + +/datum/chemical_reaction/burnmix3 // Ghetto recipe 2; wasteful . Replaces nutriment with ethenol but most of the ethenol dissolves in the process + name = "BurnMix" + id = /datum/reagent/medicine/burnmix + required_temp = 500 + mix_message = "The solution partially dissolves, binding the remaining ingredients." + results = list(/datum/reagent/medicine/burnmix = 3) // fuel and most ethenol burns away to form BurnMix from remaining ethenol and ash + required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/beer = 3, /datum/reagent/ash = 2) // Take a booze bottle, drink some , add welding fuel and ash. Heat up with lighter From 00b5eb044a905263ed61310cad6698f856a71ce1 Mon Sep 17 00:00:00 2001 From: "Robert (Hopek)" Date: Mon, 14 Oct 2019 19:39:39 -0500 Subject: [PATCH 2/6] Revert "Revert "Restoring my main branch"" This reverts commit 856950caa82eda38e06b9fbda6b65503b35d8b59. --- .../chemistry/reagents/medicine_reagents.dm | 147 ------------------ .../reagents/chemistry/recipes/medicine.dm | 24 --- 2 files changed, 171 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index a5a978b8d624..eb5303bf8dbe 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1335,152 +1335,5 @@ ..() . = 1 -/datum/reagent/medicine/burnmix - name = "BurnMix" - description = "Take in moderation. Heals damage at a snail's pace. Effects increase when used with Epinephrine or Perfluorodecalin. You don't want this in your body for longer than needed." - reagent_state = LIQUID - color = "#BD328A" // R 189 G 50 B 138 , Medium Red Violet , Hue of Violet - overdose_threshold = 12 - taste_description = "dixel" - glass_name = "glass of ...red?" - glass_desc = "Looks like some chunky dark red mix." - reagent_weight = 4 - addiction_threshold = 40 - // Max healing non OD with best rolls + buffs: 0.2 + 0.15 + 0.2 = 0.55 - // Max healing with OD + best rolls and all buffs: 0.4 + 0.35 + 0.4 = 1.15 - -/datum/reagent/medicine/burnmix/on_mob_life(mob/living/carbon/M) - var/heal_roll = pick(-0.1,-0.2) // Base heal, Non OD - var/slur = 10 // Slur 10 sets up for future slur gains as real effects seem to start at 30 - var/jitter = 0 - if(M.health <= M.crit_threshold) - heal_roll = 0 // Burnmix will not heal anyone inside of crit without epipen or morhpine - if(prob(10)) - heal_roll = 0 // Burnmix has a chance not to basic heal at all - if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) // start IF has Epinephrine in body - jitter = jitter + 5 - slur = slur + 25 - heal_roll = heal_roll - 0.15 - if(prob(15)) - M.losebreath++ - if(prob(80)) - M.adjustStaminaLoss(1.25*REM, 0) // end IF has Epinephrine in body - - if(holder.has_reagent(/datum/reagent/medicine/perfluorodecalin)) // start IF has Perfluorodecalin in body - jitter = jitter + 5 - slur = slur + 25 - M.drowsyness += 0.5 - heal_roll = heal_roll - 0.2 // start IF has Perfluorodecalin in body - - if(prob(10)) // Start of base probability effects - var/tox_roll = pick(1,-1) // Rolls for damage or healing - if(tox_roll == 1) - M.emote("moan") - if(tox_roll == -1) - M.emote("twitch") - if(prob(90)) - M.adjustToxLoss(tox_roll*REM, 0) - M.Jitter(jitter) - if(prob(1)) // Last set of non OD probability effects - M.Dizzy(jitter) - M.slurring = slur // End of base probability effects - if(heal_roll < 0) // Healing payload after calculations - if (M.stat == DEAD) // Non OD , if dead , 30% chance to discard healing payload - if(prob(70)) - M.adjustFireLoss(heal_roll*REM, FALSE, FALSE, BODYPART_ORGANIC) - M.adjustBruteLoss(heal_roll*REM, 0) - else - M.adjustFireLoss(heal_roll*REM, 0) - M.adjustBruteLoss(heal_roll*REM, 0) - ..() - . = 1 - -/datum/reagent/drug/burnmix/overdose_start(mob/living/M) - to_chat(M, "You feel the BurnMix increase in potency.") - - -/datum/reagent/medicine/burnmix/overdose_process(mob/living/M) - var/heal_roll = pick(-0.2,-0.4) - var/slur = 20 - var/jitter = 2 - if(M.health <= M.crit_threshold) - heal_roll = heal_roll + 0.2 // Burnmix in overdose will heal inside of crit without epipen or perfluorodecalin. Being in crit means a roll for either no base healing or half reduction to base heal. - if(heal_roll > 0 && prob(10)) - heal_roll = 0 // Burnmix has a chance not to basic heal at all - if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) - heal_roll = heal_roll - 0.35 - jitter = jitter + 15 - slur = slur + 25 - if(prob(25)) - M.losebreath++ - M.adjustStaminaLoss(2.5*REM, 0) - if(prob(80)) - M.adjustToxLoss(0.5*REM, 0) - M.adjustToxLoss(pick(0,-0.25), 0) // gives a chance to negate half epinephrine tox damage - - if(holder.has_reagent(/datum/reagent/medicine/perfluorodecalin)) - heal_roll = heal_roll - 0.4 - jitter = jitter + 15 - slur = slur + 25 - if(prob(25)) - M.adjustToxLoss(0.5*REM, 0) - M.adjustToxLoss(pick(0,-0.25), 0) // gives a chance to negate half perfluorodecalin tox damage - - if(holder.has_reagent(holder.has_reagent(/datum/reagent/medicine/epinephrine) && /datum/reagent/medicine/perfluorodecalin)) // start IF both drugs present - if(prob(0.5)) // Should be 1 in 200 chance of a 1 in 3 chance to roll for faint if both epinephrine and perfluorodecalin are present - M.emote((pick("scream","faint","gasp"))) - if(prob(60)) // Original edit did too much brain damage. Moved to both drug effects. Was default OD effect - M.adjustOrganLoss(ORGAN_SLOT_BRAIN,pick(1,-1)) - if(prob(30)) - slur = slur + 25 - if(prob(30)) - jitter = 50 - if(prob(30)) - M.drowsyness += 0.5 - if(prob(2)) - to_chat(M, "Your fingers spasm!") - M.drop_all_held_items() // end IF both drugs present - - if(prob(40)) // start last set of OD probability effects - M.emote(pick("twitch","drool","moan","giggle","spin")) - if(prob(60)) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, pick(0,1,2,2.5,-1,-2)) - if(prob(15)) - M.set_drugginess(pick(2,4,6)) - M.Jitter(jitter) - if(prob(40)) - M.adjustToxLoss(pick(1,-1)*REM, 0) - if(prob(1)) - M.Dizzy(jitter) // end last set of OD probability effects - M.Jitter(jitter) // OD slur and jitter after calculations - M.slurring = slur - if(heal_roll < 0) // OD Healing payload after calculations - M.adjustFireLoss(heal_roll*REM, FALSE, FALSE, BODYPART_ORGANIC) - M.adjustBruteLoss(heal_roll*REM, 0) - ..() - . = 1 - -/datum/reagent/medicine/burnmix/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1) - if(iscarbon(M)) - if (M.stat == DEAD) // If the mob is dead and you apply it via touch. You get to play an RNG healing game. - if(method in list(PATCH, TOUCH)) - var/RNG_ROLL = pick(-0.5,-0.25,-0.1,0,0.2) - var/RNG_TEXT = "no effect" - if(RNG_ROLL == -0.5) - RNG_TEXT = "had a great effect" - if(RNG_ROLL == -0.25) - RNG_TEXT = "had a good effect" - if(RNG_ROLL == -0.1) - RNG_TEXT = "had a somewhat good effect" - if(RNG_ROLL == 0.2) - RNG_TEXT = "made things worse!" - if(RNG_ROLL != 0) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine) - M.adjustBruteLoss(RNG_ROLL*reac_volume) - M.adjustFireLoss(RNG_ROLL*reac_volume) - M.visible_message("[M]'s body reacts with the Burnmix. It seemed to have [RNG_TEXT]!") - ..() - - #undef PERF_BASE_DAMAGE diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm index 2fbaaf0eef75..003e60804339 100644 --- a/code/modules/reagents/chemistry/recipes/medicine.dm +++ b/code/modules/reagents/chemistry/recipes/medicine.dm @@ -264,27 +264,3 @@ id = /datum/reagent/medicine/psicodine results = list(/datum/reagent/medicine/psicodine = 5) required_reagents = list( /datum/reagent/medicine/mannitol = 2, /datum/reagent/water = 2, /datum/reagent/impedrezene = 1) - -/datum/chemical_reaction/burnmix // Chemistry recipe - name = "BurnMix" - required_temp = 700 - id = /datum/reagent/medicine/burnmix - mix_message = "The solution boils, binding the remaining ingredients." - results = list(/datum/reagent/medicine/burnmix = 2) - required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/carbon = 1, /datum/reagent/iron = 1) - -/datum/chemical_reaction/burnmix2 // Ghetto recipe - name = "BurnMix" - id = /datum/reagent/medicine/burnmix - required_temp = 500 - mix_message = "The solution bubbles, binding the ingredients." - results = list(/datum/reagent/medicine/burnmix = 3) // Fuel burns away to form BurnMix from Nutriment and ash - required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/ash = 2) // Some welding fluid, any food and ash (burn some paper) - -/datum/chemical_reaction/burnmix3 // Ghetto recipe 2; wasteful . Replaces nutriment with ethenol but most of the ethenol dissolves in the process - name = "BurnMix" - id = /datum/reagent/medicine/burnmix - required_temp = 500 - mix_message = "The solution partially dissolves, binding the remaining ingredients." - results = list(/datum/reagent/medicine/burnmix = 3) // fuel and most ethenol burns away to form BurnMix from remaining ethenol and ash - required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/beer = 3, /datum/reagent/ash = 2) // Take a booze bottle, drink some , add welding fuel and ash. Heat up with lighter From 4e9bfc70bf802e86008a03f24637bd780d720005 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 Nov 2019 16:13:09 -0600 Subject: [PATCH 3/6] Revive SurrenderText PR This PR got closed for a stupid reason then died so I'm bringing it back. Fixed line endings. --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 1fac149696af..988012ed742b 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -350,7 +350,7 @@ /datum/emote/living/surrender key = "surrender" key_third_person = "surrenders" - message = "puts their hands on their head and falls to the ground, they surrender!" + message = "puts their hands on their head and falls to the ground, they surrender!" emote_type = EMOTE_AUDIBLE /datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional) From 3949a2823fd426247bc3b55ec8d10e756df01d53 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 Nov 2019 17:36:16 -0600 Subject: [PATCH 4/6] Makes the text easier to see Nich brought this up. Valid point. Changed to a very easy to see span. --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 988012ed742b..b4f59e9f6811 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -350,7 +350,7 @@ /datum/emote/living/surrender key = "surrender" key_third_person = "surrenders" - message = "puts their hands on their head and falls to the ground, they surrender!" + message = "puts their hands on their head and falls to the ground, they surrender!" emote_type = EMOTE_AUDIBLE /datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional) From bca6dbe65b2ac0c3b826b15135a8d000e2a071c2 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 Nov 2019 22:40:06 -0600 Subject: [PATCH 5/6] Surrendering now has its own span Per Xoxeyos's suggestion --- code/modules/goonchat/browserassets/css/browserOutput.css | 1 + code/modules/goonchat/browserassets/css/browserOutput_white.css | 1 + code/modules/mob/living/emote.dm | 2 +- interface/stylesheet.dm | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index bf0a239bc3b4..afbc18f52d19 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -327,6 +327,7 @@ em {font-style: normal; font-weight: bold;} .shadowling {color: #8e8a99;} .velvet {color: #37198b;} .cult {color: #aa1c1c;} +.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 27px;} .cultitalic {color: #aa1c1c; font-style: italic;} .cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index bed969e84b04..b9f10f058d67 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -326,6 +326,7 @@ h1.alert, h2.alert {color: #000000;} .shadowling {color: #3b2769;} .velvet {color: #21007F;} .cult {color: #960000;} +.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 27px;} .cultitalic {color: #960000; font-style: italic;} .cultbold {color: #960000; font-style: italic; font-weight: bold;} diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index b4f59e9f6811..74f33179be40 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -350,7 +350,7 @@ /datum/emote/living/surrender key = "surrender" key_third_person = "surrenders" - message = "puts their hands on their head and falls to the ground, they surrender!" + message = "puts their hands on their head and falls to the ground, they surrender!" emote_type = EMOTE_AUDIBLE /datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 02877468bdfc..01491ff862d1 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -96,6 +96,7 @@ h1.alert, h2.alert {color: #000000;} .hierophant_warning {color: #660099; font-style: italic;} .purple {color: #5e2d79;} .holoparasite {color: #35333a;} +.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 4;} .revennotice {color: #1d2953;} .revenboldnotice {color: #1d2953; font-weight: bold;} From f585662893e34e6be4cccc0d26d7836565cf31f9 Mon Sep 17 00:00:00 2001 From: Hopek Date: Mon, 11 Nov 2019 21:03:16 -0600 Subject: [PATCH 6/6] Stole Alex's span Yoink my span nerd --- .../browserassets/css/browserOutput.css | 19 ++++++++++++++++++- .../browserassets/css/browserOutput_white.css | 19 ++++++++++++++++++- interface/stylesheet.dm | 19 ++++++++++++++++++- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index afbc18f52d19..4a46d0b5bee0 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -327,7 +327,24 @@ em {font-style: normal; font-weight: bold;} .shadowling {color: #8e8a99;} .velvet {color: #37198b;} .cult {color: #aa1c1c;} -.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 27px;} +.surrender { + color: #1235d1; + font-weight: bold; + font-size: 27px; + animation: surrender 1s ease-in-out infinite alternate; + transform-origin: 0 0; + display: inline-block; + } + @keyframes surrender { + 0% { + transform: scale(1,1); + color: #ff0000; + } + 100% { + transform: scale(1.05,1); + color: #0000ff + } + } .cultitalic {color: #aa1c1c; font-style: italic;} .cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index b9f10f058d67..7391cf6bfef4 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -326,7 +326,24 @@ h1.alert, h2.alert {color: #000000;} .shadowling {color: #3b2769;} .velvet {color: #21007F;} .cult {color: #960000;} -.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 27px;} +.surrender { + color: #1235d1; + font-weight: bold; + font-size: 27px; + animation: surrender 1s ease-in-out infinite alternate; + transform-origin: 0 0; + display: inline-block; + } + @keyframes surrender { + 0% { + transform: scale(1,1); + color: #ff0000; + } + 100% { + transform: scale(1.05,1); + color: #0000ff + } + } .cultitalic {color: #960000; font-style: italic;} .cultbold {color: #960000; font-style: italic; font-weight: bold;} diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 01491ff862d1..18e386ac2ecf 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -96,7 +96,24 @@ h1.alert, h2.alert {color: #000000;} .hierophant_warning {color: #660099; font-style: italic;} .purple {color: #5e2d79;} .holoparasite {color: #35333a;} -.surrender {color: #1235d1; background-color: #e7e688 ;font-weight: bold; font-size: 4;} +.surrender { + color: #1235d1; + font-weight: bold; + font-size: 3; + animation: surrender 1s ease-in-out infinite alternate; + transform-origin: 0 0; + display: inline-block; + } + @keyframes surrender { + 0% { + transform: scale(1,1); + color: #ff0000; + } + 100% { + transform: scale(1.05,1); + color: #0000ff + } + } .revennotice {color: #1d2953;} .revenboldnotice {color: #1d2953; font-weight: bold;}