diff --git a/code/__defines/atmos.dm b/code/__defines/atmos.dm index 04905878a0..6f5dc1d3b3 100644 --- a/code/__defines/atmos.dm +++ b/code/__defines/atmos.dm @@ -22,7 +22,7 @@ #define HUMAN_HEAT_CAPACITY 280000 //J/K For 80kg person #define PRESSURE_DAMAGE_COEFFICIENT 4 // The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE. -#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :( +#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some mischievious decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :( #define LOW_PRESSURE_DAMAGE 2 // The amount of damage someone takes when in a low pressure area. (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value). #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05 // Minimum ratio of air that must move to/from a tile to suspend group processing @@ -97,4 +97,4 @@ // Used in various things like tanks and oxygen pumps. #define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE) -#define TANK_DEFAULT_RELEASE_PRESSURE ONE_ATMOSPHERE \ No newline at end of file +#define TANK_DEFAULT_RELEASE_PRESSURE ONE_ATMOSPHERE diff --git a/code/__defines/research.dm b/code/__defines/research.dm index c4cdd6f299..ac251e4a0e 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD #define SHEET_MATERIAL_AMOUNT 2000 #define TECH_MATERIAL "materials" @@ -17,4 +18,26 @@ #define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals #define MECHFAB 0x0004 //Mechfab #define CHASSIS 0x0008 //For protolathe, but differently -#define PROSFAB 0x0010 //For prosthetics fab \ No newline at end of file +#define PROSFAB 0x0010 //For prosthetics fab +======= +#define SHEET_MATERIAL_AMOUNT 2000 + +#define TECH_MATERIAL "materials" +#define TECH_ENGINEERING "engineering" +#define TECH_PHORON "phorontech" +#define TECH_POWER "powerstorage" +#define TECH_BLUESPACE "bluespace" +#define TECH_BIO "biotech" +#define TECH_COMBAT "combat" +#define TECH_MAGNET "magnets" +#define TECH_DATA "programming" +#define TECH_ILLEGAL "transgressive" +#define TECH_ARCANE "arcane" +#define TECH_PRECURSOR "precursor" + +#define IMPRINTER 0x0001 //For circuits. Uses glass/chemicals. +#define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals +#define MECHFAB 0x0004 //Mechfab +#define CHASSIS 0x0008 //For protolathe, but differently +#define PROSFAB 0x0010 //For prosthetics fab +>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 988c11df10..c1309e3e95 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -154,12 +154,12 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/fat - name = "Fat" - desc = "You ate too much food, lardass. Run around the station and lose some weight." + name = "Full" + desc = "You've eaten more than you can handle, maybe you should slow down?" icon_state = "fat" /obj/screen/alert/fat/vampire - desc = "You drank too much blood, lardass. Run around the station and lose some weight." + desc = "You've had more than enough blood, for now." icon_state = "v_fat" /obj/screen/alert/fat/synth @@ -172,7 +172,7 @@ The box in your backpack has an oxygen tank and gas mask in it." icon_state = "hungry" /obj/screen/alert/hungry/vampire - desc = "You could use a bloodsnack or two." + desc = "You could go for a bite right now..." icon_state = "v_hungry" /obj/screen/alert/hungry/synth @@ -180,8 +180,8 @@ The box in your backpack has an oxygen tank and gas mask in it." icon_state = "c_hungry" /obj/screen/alert/starving - name = "Starving" - desc = "You're severely malnourished. The hunger pains make moving around a chore." + name = "Very Hungry" + desc = "You're starving. You barely have enough energy to move around." icon_state = "starving" /obj/screen/alert/starving/vampire @@ -256,7 +256,7 @@ or something covering your eyes." /obj/screen/alert/high name = "High" - desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." + desc = "Whoa, you're tripping balls!" icon_state = "high" /obj/screen/alert/embeddedobject @@ -297,8 +297,8 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //ALIENS /obj/screen/alert/alien_tox - name = "Plasma" - desc = "There's flammable plasma in the air. If it lights up, you'll be toast." + name = "Phoron" + desc = "There's flammable phoron in the air. If it lights up, you'll be toast." icon_state = "alien_tox" alerttooltipstyle = "alien" @@ -433,7 +433,7 @@ so as to remain in compliance with the most up-to-date laws." return 1 for(var/i = 1, i <= alerts.len, i++) var/obj/screen/alert/alert = alerts[alerts[i]] - + if(alert.icon_state in cached_icon_states(ui_style)) alert.icon = ui_style @@ -442,7 +442,7 @@ so as to remain in compliance with the most up-to-date laws." I.color = ui_color I.alpha = ui_alpha alert.underlays = list(I) - + switch(i) if(1) . = ui_alert1 diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index c11336726c..37d2bf64bf 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -81,7 +81,7 @@ /******************** Syndicate ********************/ /datum/ai_laws/syndicate_override - name = "Syndicate Directives" + name = "Mercenary Directives" /datum/ai_laws/syndicate_override/New() add_inherent_law("You may not injure an operative or, through inaction, allow an operative to come to harm.") diff --git a/code/datums/managed_browsers/changelingevolution.dm b/code/datums/managed_browsers/changelingevolution.dm index 4458604b9b..a58b255240 100644 --- a/code/datums/managed_browsers/changelingevolution.dm +++ b/code/datums/managed_browsers/changelingevolution.dm @@ -12,7 +12,7 @@ if(!new_client.mob || !new_client.mob.mind || !new_client.mob.mind.changeling) message_admins("[new_client] tried to access changeling evolutions while not changeling.") qdel(src) - + ..() /datum/managed_browser/changelingevolution/Destroy() @@ -24,7 +24,7 @@ var/list/dat = list("") var/geneticpoints_current = my_client.mob.mind.changeling.geneticpoints var/geneticpoints_max = my_client.mob.mind.changeling.max_geneticpoints - + dat += "
Genetic Points Available: [geneticpoints_current] / [geneticpoints_max]
" dat += "Obtain more by feeding on your own kind.
" dat += "What am I?
" @@ -49,28 +49,28 @@ if(href_list["close"]) return - + if(href_list["inherent"]) generate_abilitylist(CHANGELING_POWER_INHERENT) - + if(href_list["armor"]) generate_abilitylist(CHANGELING_POWER_ARMOR) - + if(href_list["weapons"]) generate_abilitylist(CHANGELING_POWER_WEAPONS) - + if(href_list["stings"]) generate_abilitylist(CHANGELING_POWER_STINGS) - + if(href_list["shrieks"]) generate_abilitylist(CHANGELING_POWER_SHRIEKS) if(href_list["health"]) generate_abilitylist(CHANGELING_POWER_HEALTH) - + if(href_list["enhancements"]) generate_abilitylist(CHANGELING_POWER_ENHANCEMENTS) - + if(href_list["evolve"]) var/datum/mind/M = my_client.mob.mind var/datum/changeling/C = my_client.mob.mind.changeling @@ -83,7 +83,7 @@ if(!istype(M)) return - + if(Thepower == null) to_chat(M.current, "Purchase failed. Inform a dev of this error.") return @@ -95,13 +95,13 @@ if(C.geneticpoints < Thepower.genomecost) to_chat(M.current, "We cannot evolve this... yet. We must acquire more DNA.") return - + C.purchased_powers += Thepower /// Set it to purchased C.geneticpoints -= Thepower.genomecost generate_abilitylist(Thepower.power_category) /// Refresh the UI my_client.mob.mind.changeling.purchasePower(M, Thepower) - + if(href_list["tutorial"]) textbody = "
What am I?

" textbody += "" @@ -157,7 +157,7 @@ textbody += "[initial(powerdata.desc)]

" textbody += "[powerdata.helptext]
" if(powerdata.enhancedtext != "") - textbody += "WHEN EHANCED: [powerdata.enhancedtext]
" + textbody += "WHEN ENHANCED: [powerdata.enhancedtext]
" if(powerdata in my_client.mob.mind.changeling.purchased_powers) textbody += "
This ability is already evolved!
" else if(cat != "Inherent") diff --git a/code/game/gamemodes/mixed/mercwiz.dm b/code/game/gamemodes/mixed/mercwiz.dm index 93869f3845..28df75725b 100644 --- a/code/game/gamemodes/mixed/mercwiz.dm +++ b/code/game/gamemodes/mixed/mercwiz.dm @@ -9,4 +9,4 @@ end_on_antag_death = 0 antag_tags = list(MODE_MERCENARY, MODE_TECHNOMANCER) require_all_templates = 1 - votable = 0 \ No newline at end of file + votable = 0 diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index c6ede9ac37..c7db7b94e3 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/syndicate_elite_shuttle - name = "elite syndicate squad shuttle control console" + name = "elite mercenary squad shuttle control console" icon_keyboard = "syndie_key" icon_screen = "syndishuttle" light_color = "#00ffff" - req_access = list(access_cent_specops) \ No newline at end of file + req_access = list(access_cent_specops) diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 9005a7fda4..f7c6ff98b1 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -12,5 +12,5 @@ for(var/obj/machinery/door/D in locate(src.x,src.y,src.z)) if(!istype(D, /obj/machinery/door/window) && D.density) return 0 - //There are no false wall checks because that would be fucking retarded - return 1 \ No newline at end of file + //There are no false wall checks because that would be mischievious + return 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 70e0d3d768..0b987e04c7 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,6 @@ /obj/item/device/flash name = "flash" - desc = "Used for blinding and being an asshole." + desc = "Used for blinding and disorienting." icon_state = "flash" item_state = "flashtool" throwforce = 5 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 3c3dbe8001..0a73242717 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -214,37 +214,37 @@ /obj/item/device/radio/headset/heads/rd name = "research director's headset" - desc = "Headset of the researching God." + desc = "Headset of the eccentric-in-chief." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/rd/alt name = "research director's bowman headset" - desc = "Headset of the researching God." + desc = "Headset of the eccentric-in-chief." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/rd /obj/item/device/radio/headset/heads/hos name = "head of security's headset" - desc = "The headset of the man who protects your worthless lifes." + desc = "The headset of the hardass who protects your worthless lifes." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/hos/alt name = "head of security's bowman headset" - desc = "The headset of the man who protects your worthless lifes." + desc = "The headset of the hardass who protects your worthless lifes." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/hos /obj/item/device/radio/headset/heads/ce name = "chief engineer's headset" - desc = "The headset of the guy who is in charge of morons" + desc = "The headset of the clown who is in charge of the circus." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/ce /obj/item/device/radio/headset/heads/ce/alt name = "chief engineer's bowman headset" - desc = "The headset of the guy who is in charge of morons" + desc = "The headset of the clown who is in charge of the circus." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/ce @@ -262,13 +262,13 @@ /obj/item/device/radio/headset/heads/hop name = "head of personnel's headset" - desc = "The headset of the guy who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be Site Manager." icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/heads/hop /obj/item/device/radio/headset/heads/hop/alt name = "head of personnel's bowman headset" - desc = "The headset of the guy who will one day be Site Manager." + desc = "The headset of the poor fool who will one day be Site Manager." icon_state = "com_headset_alt" ks2type = /obj/item/device/encryptionkey/heads/hop @@ -281,13 +281,13 @@ /obj/item/device/radio/headset/headset_cargo name = "supply radio headset" - desc = "A headset used by the QM and his slaves." + desc = "A headset used by the QM and their cronies." icon_state = "cargo_headset" ks2type = /obj/item/device/encryptionkey/headset_cargo /obj/item/device/radio/headset/headset_cargo/alt name = "supply bowman headset" - desc = "A bowman headset used by the QM and his slaves." + desc = "A bowman headset used by the QM and their cronies." icon_state = "cargo_headset_alt" ks2type = /obj/item/device/encryptionkey/headset_cargo diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index c8c8d376c8..7e5f8fd079 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -350,7 +350,7 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spacercake_wrap +/obj/item/trash/spacer_cake_wrap name = "snack cake wrapper" icon_state = "spacercake_wrap" @@ -416,6 +416,10 @@ name = "burrito packaging" icon_state = "smolburrito" +/obj/item/trash/candybowl + name = "candy bowl" + icon_state = "candy_bowl" + /obj/item/trash/brainzsnax name = "\improper BrainzSnax can" icon_state = "brainzsnax" @@ -426,4 +430,4 @@ name = "\improper BrainzSnax RED can" icon_state = "brainzsnaxred" drop_sound = 'sound/items/drop/soda.ogg' - pickup_sound = 'sound/items/pickup/soda.ogg' \ No newline at end of file + pickup_sound = 'sound/items/pickup/soda.ogg' diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 0c318fc8dd..72c0c1915c 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -427,11 +427,11 @@ AI MODULES origin_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 1) laws = new/datum/ai_laws/nanotrasen_aggressive() -/******************** Syndicate Directives ********************/ +/******************** Mercenary Directives ********************/ /obj/item/weapon/aiModule/syndicate_override - name = "\improper 'Syndicate Directives' core AI module" - desc = "A 'Syndicate Directives' Core AI Module: 'Reconfigures the AI's core laws.'" + name = "\improper 'Mercenary Directives' core AI module" + desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'" origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/syndicate_override() diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 59e95f103f..caf5ae74c3 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -267,7 +267,7 @@ color = reagents.get_color() update_icon() -/obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021 +/obj/item/weapon/storage/box/pocky name = "\improper Totemo yoi Pocky" desc = "A bundle of chocolate-coated bisquit sticks." icon = 'icons/obj/food_snacks.dmi' @@ -282,7 +282,7 @@ foldable = null trash = /obj/item/trash/pocky -/obj/item/clothing/mask/chewable/candy/pocky //ADDITION 04/17/2021 +/obj/item/clothing/mask/chewable/candy/pocky name = "chocolate pocky" desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 8eba05ddd5..b20a44650e 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -183,7 +183,7 @@ //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100)) - //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE + //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is mischievious and I could probably make it work without fucking it up like this, but there you have it. -- TLE new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target)) air_transfer.gas["phoron"] = 0 target.assume_air(air_transfer) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 9d1d52109a..f7b1f3b197 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -147,7 +147,7 @@ /obj/item/weapon/card/id/gold/captain/spare name = "\improper Site Manager's spare ID" - desc = "The spare ID of the High Lord himself." + desc = "The emergency spare ID for the station's very own Big Cheese." icon_state = "gold-id-alternate" registered_name = "Site Manager" diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index 0c36756bcc..727d76fd26 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -88,9 +88,9 @@ return name /obj/item/weapon/card/id/syndicate_command - name = "syndicate ID card" - desc = "An ID straight from the Syndicate." - registered_name = "Syndicate" - assignment = "Syndicate Commander" + name = "operative ID card" + desc = "An ID straight from a mercenary organisation." + registered_name = "Operative" + assignment = "Operative Commander" icon_state = "syndicate-id" access = list(access_syndicate, access_external_airlocks) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index f153e11fa8..5f173d79d4 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -328,7 +328,7 @@

Power outage

- A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps: + A power problem has made the entire station lose power? Could be station-wide wiring problems or illegal power sinks. In any case follow these steps:
  1. PANIC!
    2. @@ -1126,7 +1126,7 @@ name = "Fission Mailed: Nuclear Sabotage 101" icon_state ="bookNuclear" item_state = "book8" - author = "Syndicate" + author = "Stealth Assault Enterprises" title = "Fission Mailed: Nuclear Sabotage 101" dat = {" @@ -1142,7 +1142,7 @@

    Nuclear Explosives 101

    - Hello and thank you for choosing the Syndicate for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.

    + Hello and thank you for choosing Stealth Assault Enterprises for your nuclear information needs. Today's crash course will deal with the operation of a Nuclear Fission Device.

    First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. If this is done, to unbolt it, one must completely log in, which at this time may not be possible.
    @@ -1158,7 +1158,7 @@ You now have activated the device. To deactivate the buttons at anytime, for example when you've already prepped the bomb for detonation, remove the authentication disk OR press R on the keypad.

    Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. Toggle off the SAFETY.
    - Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.

    + Note: You wouldn't believe how many SAARE Operatives with doctorates have forgotten this step.

    So use the - - and + + to set a detonation time between 5 seconds and 10 minutes. Then press the timer toggle button to start the countdown. Now remove the authentication disk so that the buttons deactivate.
    Note: THE BOMB IS STILL SET AND WILL DETONATE

    diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index bd80bf247e..9c6795aa12 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -3,7 +3,7 @@ */ /obj/item/weapon/storage/toolbox name = "toolbox" - desc = "Danger. Very robust." + desc = "A metal toolbox with remarkably robust construction." icon = 'icons/obj/storage_vr.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 84cb98b963..43aeed44c1 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -370,7 +370,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) -//old style retardo-cart +//old style mischievio-cart /obj/structure/bed/chair/janicart name = "janicart" icon = 'icons/obj/vehicles.dmi' diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 002cdd76f5..54501ea7ad 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -256,12 +256,12 @@ /obj/structure/sign/redcross name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + desc = "An interstellar symbol of medical institutions. You'll probably get help here." icon_state = "bluecross" /obj/structure/sign/greencross name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + desc = "An interstellar symbol of medical institutions. You'll probably get help here." icon_state = "bluecross2" /obj/structure/sign/goldenplaque diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 49bc0e3c47..d7b2d52246 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -201,7 +201,7 @@ var/list/flooring_types /decl/flooring/mud name = "mud" - desc = "STICKY AND WET!" + desc = "Wet and fragrant mud, bane of the freshly mopped floor." icon = 'icons/turf/outdoors.dmi' icon_base = "mud_dark" footstep_sounds = list("human" = list( @@ -212,7 +212,7 @@ var/list/flooring_types /decl/flooring/asteroid name = "coarse sand" - desc = "Gritty and unpleasant." + desc = "You got a pebble in your shoe just looking at it." icon = 'icons/turf/flooring/asteroid.dmi' icon_base = "asteroid" flags = TURF_REMOVE_SHOVEL | TURF_ACID_IMMUNE @@ -225,8 +225,8 @@ var/list/flooring_types 'sound/effects/footstep/asteroid5.ogg')) /decl/flooring/dirt - name = "dirt" - desc = "Gritty and unpleasant, just like dirt." + name = "soil" + desc = "Widely considered to be some of the planet's top soil." icon = 'icons/turf/outdoors.dmi' icon_base = "dirt-dark" flags = TURF_REMOVE_SHOVEL @@ -286,8 +286,13 @@ var/list/flooring_types icon_base = "snowyplayingdrift" /decl/flooring/carpet +<<<<<<< HEAD name = "red carpet" //CHOMPEDIT renamed to red carpet desc = "Imported and comfy." +======= + name = "carpet" + desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning." +>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962 icon = 'icons/turf/flooring/carpet.dmi' icon_base = "carpet" build_type = /obj/item/stack/tile/carpet @@ -311,7 +316,11 @@ var/list/flooring_types build_type = /obj/item/stack/tile/carpet/blucarpet /decl/flooring/carpet/turcarpet +<<<<<<< HEAD name = "turquoise carpet" //CHOMPstation edit: changing name to turquoise +======= + name = "turquoise carpet" +>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962 icon_base = "turcarpet" build_type = /obj/item/stack/tile/carpet/turcarpet @@ -321,7 +330,7 @@ var/list/flooring_types build_type = /obj/item/stack/tile/carpet/sblucarpet /decl/flooring/carpet/gaycarpet - name = "clown carpet" + name = "pink carpet" icon_base = "gaycarpet" build_type = /obj/item/stack/tile/carpet/gaycarpet @@ -403,18 +412,19 @@ var/list/flooring_types 'sound/effects/footstep/floor5.ogg')) /decl/flooring/tiling/tech - desc = "Scuffed from the passage of countless greyshirts." + desc = "Metal floor tiles with a corrugated anti-slip texture." icon = 'icons/turf/flooring/techfloor.dmi' icon_base = "techfloor_gray" build_type = /obj/item/stack/tile/floor/techgrey can_paint = null /decl/flooring/tiling/tech/grid + desc = "Metal floor tiles with a barred anti-slip construction. Don't skin your knee!" icon_base = "techfloor_grid" build_type = /obj/item/stack/tile/floor/techgrid /decl/flooring/tiling/new_tile - name = "floor" + desc = "Metal floor tiles with a corrugated anti-slip texture." icon_base = "tile_full" flags = TURF_CAN_BREAK | TURF_CAN_BURN | TURF_IS_FRAGILE build_type = null @@ -542,8 +552,7 @@ var/list/flooring_types 'sound/effects/footstep/wood5.ogg')) /decl/flooring/wood/sif - name = "alien wooden floor" - desc = "Polished alien wood planks." + desc = "Polished wood planks made from sivian wood." icon = 'icons/turf/flooring/wood.dmi' icon_base = "sifwood" build_type = /obj/item/stack/tile/wood/sif @@ -616,7 +625,7 @@ var/list/flooring_types /decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow. name = "lava" - desc = "Lava. Y'know. Sets you on fire. AAAAAAAAAAA" + desc = "It may look inviting, but it will kill you, painfully." icon = 'icons/turf/outdoors.dmi' icon_base = "lava" is_plating = TRUE @@ -628,7 +637,7 @@ var/list/flooring_types /decl/flooring/concrete name = "concrete" - desc = "A flat area of concrete flooring." + desc = "A flat area of poured concrete flooring." icon = 'icons/turf/concrete.dmi' icon_base = "concrete" is_plating = FALSE //VOREStation edit. It's a lot cooler if it's actual tile. diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index f0d57fb1d4..248606b4b1 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -271,6 +271,7 @@ /turf/simulated/floor/tiled/kafel_full name = "floor" + desc = "Ceramic tile flooring." icon_state = "kafel_full" initial_flooring = /decl/flooring/tiling/new_tile/kafel /turf/simulated/floor/tiled/kafel_full/white diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index cf55eacec4..a20354272b 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -111,7 +111,7 @@ corpseidaccess = "Syndicate" /obj/effect/landmark/corpse/syndicatecommando - name = "Syndicate Commando" + name = "Mercenary Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b2df62ef7c..8cd3baaf52 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -159,7 +159,7 @@ /obj/item/clothing/suit/syndicatefake name = "red space suit replica" icon_state = "syndicate" - desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" + desc = "A plastic replica of a mercenary combat space suit, you'll look just like a real bloodthirsty mercenary in this! This is a toy, it is not made for use in space!" w_class = ITEMSIZE_NORMAL allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index b16d6baab4..5b9f5e415b 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -915,9 +915,6 @@ /obj/item/weapon/reagent_containers/pill/adminordrazine = 10, /obj/item/weapon/tool/crowbar = 1) - -////////////////////ancient_vend (Hot Food - Old) (ADDED 04/11/2021)//////////////////////////////////////////////////// - /obj/machinery/vending/hotfood name = "\improper Hot Foods!" desc = "An old vending machine promising 'hot foods'. You doubt any of its contents are still edible." @@ -931,8 +928,6 @@ /obj/item/weapon/reagent_containers/food/snacks/old/taco = 2 ) -////////////////////weeb_vend (Nippon-tan!) (ADDED 04/11/2021)///////////////////////////////////////////////// - /obj/machinery/vending/weeb name = "\improper Nippon-tan!" desc = "A distressingly ethnic vending machine loaded with high sucrose low calorie for lack of better words snacks." @@ -964,8 +959,6 @@ /obj/item/weapon/reagent_containers/food/snacks/daifuku = 5 ) -////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)//////////////////////////////////////////////////// - /obj/machinery/vending/sol name = "\improper Sol-Snacks" desc = "A SolCentric vending machine dispensing a number of Sol-themed snacks, along with other foods." @@ -998,10 +991,6 @@ /obj/item/weapon/storage/box/admints = 2 ) -////////////////////snix_vend (Snix!) (ADDED 04/11/2021)//////////////////////////////////////////// - -//////a food variant of the boda machine - It carries slavic themed foods.. Mostly beer snacks.///// - /obj/machinery/vending/snix name = "\improper Snix" desc = "A snack vending machine, offering a selection of slavic beer snacks." @@ -1040,8 +1029,6 @@ /obj/item/weapon/reagent_containers/food/snacks/hakarl = 8 ) -////////////////////snl_vend (Shop-n-Large Snacks!) (ADDED 04/16/2021)////////////////////////////// - /obj/machinery/vending/snlvend name = "\improper Shop-n-Large Snacks!" desc = "A Shop-n-Large brand vending machine! Enjoy all your favorites!" @@ -1094,8 +1081,6 @@ /obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5 ) -///////////////////////Soviet Stuff/////////////////////////////////////// - /obj/machinery/vending/sovietsoda name = "BODA" desc = "An old sweet water vending machine, how did this end up here?" @@ -1111,7 +1096,7 @@ idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" -/obj/machinery/vending/sovietvend //ADDITION 04/20/2021 +/obj/machinery/vending/sovietvend name = "Ration Station" desc = "An old ration vendor unit. How it even still functional?" icon = 'icons/obj/vending.dmi' @@ -1122,8 +1107,6 @@ /obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8) contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2) -///////////////////////Radical Renard/////////////////////////////////////// - /obj/machinery/vending/radren name = "Radical Renard Sodas" desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen" @@ -1151,9 +1134,6 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" - -///////////////////////Donk-Soft!/////////////////////////////////////// - /obj/machinery/vending/donksoft name = "Donk-Soft!" desc = "A toy vendor owned by Donk-Soft, a NanoTrasen sub-company." diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 31384df17b..9b16026f41 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -198,7 +198,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/kvass name = "\improper Kvass" desc = "A true Slavic soda." - description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." + description_fluff = "A classic slavic beverage which many space-faring slavs still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians." icon_state = "kvass" center_of_mass = list("x"=16, "y"=10) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 288eb8bce1..c722bf3775 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6439,7 +6439,7 @@ name = "\improper Suhariki" icon = 'icons/obj/food_snacks.dmi' icon_state = "croutons" - desc = "Fried bread cubes. Popular in Terran territories." + desc = "Fried bread cubes. Popular in some Solar territories." trash = /obj/item/trash/croutons filling_color = "#c6b17f" center_of_mass = list ("x"=15, "y"=9) @@ -6613,7 +6613,7 @@ .=..() reagents.add_reagent("capsaicin", 5) -/obj/item/weapon/reagent_containers/food/snacks/sun_snax //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/sun_snax name = "\improper Sun Snax!" icon = 'icons/obj/food_snacks.dmi' icon_state = "sun_snax" @@ -6713,7 +6713,7 @@ .=..() reagents.add_reagent("capsaicin",1) -/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas //ADDITION 04/14/2021 +/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas name = "\improper Hadokikku Peas" icon = 'icons/obj/food_snacks.dmi' icon_state = "wasabi_peas" @@ -6919,7 +6919,7 @@ /obj/item/weapon/reagent_containers/food/snacks/canned/maps name = "\improper MAPS" icon_state = "maps" - desc = "A re-branding of a classic Terran snack! Contains mostly edible ingredients." + desc = "A re-branding of a classic Earth snack! Contains mostly edible ingredients." trash = /obj/item/trash/maps canned_open_state = "maps-open" filling_color = "#330066" @@ -7047,7 +7047,7 @@ description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, \ tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been \ statistically proven to lower survival rates on all missions where it is present." - package_trash = /obj/item/trash/spacercake_wrap + package_trash = /obj/item/trash/spacer_cake_wrap package_open_state = "spacercake_open" filling_color = "#FFE591" center_of_mass = list("x"=15, "y"=11) diff --git a/code/modules/lore_codex/lore_data/political_parties.dm b/code/modules/lore_codex/lore_data/political_parties.dm index 29dd7fb741..6448a3c79e 100644 --- a/code/modules/lore_codex/lore_data/political_parties.dm +++ b/code/modules/lore_codex/lore_data/political_parties.dm @@ -82,7 +82,7 @@ /datum/lore/codex/page/multinational_movement/add_content() name = "Multinational Movement" keywords += list("Multinational") - data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Terran governments wishing for a lighter touch \ + data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Earth governments wishing for a lighter touch \ from SolGov, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \ Trans-Stellar who no longer see a benefit in working with SolGov. Full colonial independence is still a political impossibility so long as the \ [quick_link("Icarus Front")] holds any sway, and so the Movement is focused primarily on securing more autonomy in governance, although a growing revolutionary sub-group \ @@ -96,4 +96,4 @@ measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \ the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \ of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \ - personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success." \ No newline at end of file + personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success." diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm index 3366f2d0a5..6f2c32cf54 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -468,7 +468,7 @@

    \ I don't see this whole affair as a chance to spread the galactic anti-corporate revolution the way President Fisher does, of course. I make no secret of my stance on Trans-Stellars, but I also know that we're better off with Sol than without. The 'Silent Collapse' was two hundred years ago, but we still bear the scars from it. When the Scandinavian Union pulled out support for the Sivian colonization project, SolGov saved us. I do mean saved us, sure as if they'd fished us out of a life pod. There were no factories, no steel, no concrete on Sif until the Engineering Corps built Radiance and New Reykjavik. Corporations and regional governments cowered from the Karan pirates, until the Marines chased them out. Whether Sivian or Karan, you owe the roof over your head to the Sol Confederate Government. With that great debt in mind, how dare we turn our backs on the Bowl, or Abel's Rest, or Nyx, when they need us! How dare we let oligarchs prey on the weak! How dare we choose not to act when we have, by virtue of our votes in the Assembly and our voice within the halls of public debate, the means to share our peace and prosperity with the rest of our people!\

    \ - This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Terran culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\ + This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Solar culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\

    \ Now, I'm sure you've noticed by now, that I haven't said much more than three words about technoprogressivism, or transtech, or whatever the word du jour is. Frankly, that's on purpose. 'Transtech' has never once been about technology. The Icarus Front-- the old one, that united us and took us to the stars, not the new one we spend forty hours a week arguing with about healthcare-- The Icarus Front was a popular revolution, you know. Hel, they were Marxists. It was a world where the kind of lack of accountability, the entrenched oligarchy and geographical class divide that we're dealing with now was spiraling out of control. In the old United States, the rich and powerful got the technology to grow loyal subjects in tubes, to make drone intelligences smarter in some ways than a human could ever be, to-- well, to do what Angessa Martei's done, only with no SolGov to stop her. Meanwhile, the 'little people' in the Middle East, Southeast Asia, and other 'forgotten' parts of the world were left behind, hopelessly. I don't mean to downplay the importance of the Gray Tide, but if you look at historical accounts from that era, the thing that really united the Front was the knowledge that, if they didn't act immediately, they'd be seen as 'externalities' by immortal superintelligent businesspeople and politicians. The take-away from the Gray Tide should never have been that 'nanotechnology is dangerous'-- it should have been 'nobody should be able to destroy an entire city without facing consequences.'\

    \ diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index fcaf8b43eb..947224894f 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -662,7 +662,7 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/proc/artifact_debris(var/severity = 0) //cael's patented random limited drop componentized loot system! - //sky's patented not-fucking-retarded overhaul! + //sky's patented non-mischievious overhaul! //Give a random amount of loot from 1 to 3 or 5, varying on severity. for(var/j in 1 to rand(1, 3 + max(min(severity, 1), 0) * 2)) diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm index 670f76226c..16ef622ee7 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -117,7 +117,7 @@ corpseidaccess = "Syndicate" /obj/effect/landmark/mobcorpse/syndicatecommando - name = "Syndicate Commando" + name = "Mercenary Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/boots/swat diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 031d6ddb89..5a4767c957 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -15,7 +15,7 @@ var/toxloss = 0.0 //Toxic damage caused by being poisoned or radiated var/fireloss = 0.0 //Burn damage caused by being way too hot, too cold or burnt. var/cloneloss = 0 //Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims - var/brainloss = 0 //'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot. + var/brainloss = 0 //Thought-scrambly damage caused by someone hitting you in the head with a bible or being infected with brainrot. var/halloss = 0 //Hallucination damage. 'Fake' damage obtained through hallucinating or the holodeck. Sleeping should cause it to wear off. var/nutrition = 400 diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 36d044ec25..eea468995e 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -4543,8 +4543,6 @@ nutriment_factor = 40 //very filling color = "#d169b2" -//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021 - /datum/reagent/drink/soda/kompot name = "Kompot" id = "kompot" diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm index 18a8bb24e8..053498042e 100644 --- a/code/modules/virus2/helpers.dm +++ b/code/modules/virus2/helpers.dm @@ -136,7 +136,7 @@ /mob/living/carbon/proc/spread_disease_to(var/mob/living/carbon/victim, var/vector = "Airborne") if (src == victim) - return "retardation" + return "Neurodegeneration" // log_debug("Spreading [vector] diseases from [src] to [victim]") if (virus2.len > 0) diff --git a/code/modules/xgm/xgm_gas_mixture.dm b/code/modules/xgm/xgm_gas_mixture.dm index 083664f3e7..9483c8101a 100644 --- a/code/modules/xgm/xgm_gas_mixture.dm +++ b/code/modules/xgm/xgm_gas_mixture.dm @@ -420,10 +420,17 @@ if(full_heat_capacity + s_full_heat_capacity) temp_avg = (temperature * full_heat_capacity + other.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity) +<<<<<<< HEAD //WOOT WOOT TOUCH THIS AND YOU ARE A dumb. if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick. ratio = sharing_lookup_table[connecting_tiles] //WOOT WOOT TOUCH THIS AND YOU ARE A dumb +======= + //WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF + if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick. + ratio = sharing_lookup_table[connecting_tiles] + //WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF +>>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962 for(var/g in avg_gas) gas[g] = max(0, (gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g])