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 b55f6601f8..b37808def9 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -9,7 +9,7 @@ #define TECH_COMBAT "combat" #define TECH_MAGNET "magnets" #define TECH_DATA "programming" -#define TECH_ILLEGAL "syndicate" +#define TECH_ILLEGAL "transgressive" #define TECH_ARCANE "arcane" #define TECH_PRECURSOR "precursor" @@ -17,4 +17,4 @@ #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 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index ef8b8ebbeb..02edb5e62c 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 else if(!alert.no_underlay) @@ -441,7 +441,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 50323e55bd..4a870a1bf7 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,6 @@ /obj/item/flash name = "flash" - desc = "Used for blinding and being an asshole." + desc = "Used to blind and disorient." icon = 'icons/obj/device.dmi' pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 3919c8de5d..eea8d32b73 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -212,37 +212,37 @@ /obj/item/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/encryptionkey/heads/rd /obj/item/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/encryptionkey/heads/rd /obj/item/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/encryptionkey/heads/hos /obj/item/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/encryptionkey/heads/hos /obj/item/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/encryptionkey/heads/ce /obj/item/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/encryptionkey/heads/ce @@ -260,13 +260,13 @@ /obj/item/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/encryptionkey/heads/hop /obj/item/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/encryptionkey/heads/hop @@ -279,13 +279,13 @@ /obj/item/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/encryptionkey/headset_cargo /obj/item/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/encryptionkey/headset_cargo diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9b5da48e21..478d7f6ecb 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -234,31 +234,31 @@ return -/obj/item/trash/beef //ADDITION 04/11/2021 +/obj/item/trash/beef name = "empty beef can" icon_state = "beef" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/beans //ADDITION 04/11/2021 +/obj/item/trash/beans name = "empty bean can" icon_state = "beans" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spinach //ADDITION 04/11/2021 +/obj/item/trash/spinach name = "empty spinach can" icon_state = "spinach" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/fishegg //ADDITION 04/11/2021 +/obj/item/trash/fishegg name = "empty fisheggs can" icon_state = "fisheggs" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/carpegg //ADDITION 04/11/2021 +/obj/item/trash/carpegg name = "empty carpeggs can" icon_state = "carpeggs" drop_sound = 'sound/items/drop/soda.ogg' @@ -270,124 +270,124 @@ drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/salo //ADDITION 04/11/2021 +/obj/item/trash/salo name = "salo pack" icon_state = "pigfat" -/obj/item/trash/croutons //ADDITION 04/11/2021 +/obj/item/trash/croutons name = "suhariki pack" icon_state = "croutons" -/obj/item/trash/squid //ADDITION 04/11/2021 +/obj/item/trash/squid name = "calamari pack" icon_state = "squid" -/obj/item/trash/driedfish //ADDITION 04/11/2021 +/obj/item/trash/driedfish name = "vobla pack" icon_state = "driedfish" -/obj/item/trash/lunacakewrap //ADDITION 04/11/2021 +/obj/item/trash/lunacakewrap name = "cake wrapper" icon_state = "cakewrap" -/obj/item/trash/mochicakewrap //ADDITION 04/11/2021 +/obj/item/trash/mochicakewrap name = "cake wrapper" icon_state = "mochicakewrap" -/obj/item/trash/mooncakewrap //ADDITION 04/11/2021 +/obj/item/trash/mooncakewrap name = "cake wrapper" icon_state = "mooncakewrap" -/obj/item/trash/tidegobs//ADDITION 04/11/2021 +/obj/item/trash/tidegobs name = "tide gob bag" icon_state = "tidegobs" -/obj/item/trash/saturno//ADDITION 04/11/2021 +/obj/item/trash/saturno name = "\improper saturn-Os bag" icon_state = "saturn0s" -/obj/item/trash/jupiter//ADDITION 04/11/2021 +/obj/item/trash/jupiter name = "gello cup" icon_state = "jupiter" -/obj/item/trash/pluto//ADDITION 04/11/2021 +/obj/item/trash/pluto name = "rod bag" icon_state = "pluto" -/obj/item/trash/venus//ADDITION 04/11/2021 +/obj/item/trash/venus name = "hot cakes bag" icon_state = "venus" -/obj/item/trash/mars//ADDITION 04/11/2021 +/obj/item/trash/mars name = "frouka box" icon_state = "mars" -/obj/item/trash/oort//ADDITION 04/11/2021 +/obj/item/trash/oort name = "oort rock bag" icon_state = "oort" -/obj/item/trash/weebonuts//ADDITION 04/11/2021 +/obj/item/trash/weebonuts name = "red alert nuts bag" icon_state = "weebonuts" -/obj/item/trash/stick//ADDITION 04/11/2021 +/obj/item/trash/stick name = "stick" desc = "a stick from some snack or other food item, not even useful as crafting material." icon_state = "stick" -/obj/item/trash/maps//ADDITION 04/13/2021 +/obj/item/trash/maps name = "empty MAPS can" icon_state = "maps" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/spacer_cake_wrap//ADDITION 04/14/2021 +/obj/item/trash/spacer_cake_wrap name = "snack cake wrapper" icon_state = "spacer_cake_wrap" -/obj/item/trash/sun_snax//ADDITION 04/14/2021 +/obj/item/trash/sun_snax name = "sun snax bag" icon_state = "sun_snax" -/obj/item/trash/wasabi_peas//ADDITION 04/14/2021 +/obj/item/trash/wasabi_peas name = "wasabi peas bag" icon_state = "wasabi_peas" -/obj/item/trash/namagashi//ADDITION 04/14/2021 +/obj/item/trash/namagashi name = "namagashi bag" icon_state = "namagashi" -/obj/item/trash/pocky//ADDITION 04/14/2021 +/obj/item/trash/pocky name = "pocky bag" icon_state = "pocky" -/obj/item/trash/appleberry//ADDITION 04/14/2021 +/obj/item/trash/appleberry name = "appleberry can" icon_state = "appleberry" drop_sound = 'sound/items/drop/soda.ogg' pickup_sound = 'sound/items/pickup/soda.ogg' -/obj/item/trash/hakarl//ADDITION 04/22/2021 +/obj/item/trash/hakarl name = "\improper Indigo Co. Hákarl bag" icon_state = "hakarl" -/obj/item/trash/pretzel//ADDITION 04/22/2021 +/obj/item/trash/pretzel name = "\improper Value Pretzel Snack" icon_state = "pretzel" -/obj/item/trash/sweetration//ADDITION 04/20/2021 +/obj/item/trash/sweetration name = "desert ration bag" icon_state = "baseration" -/obj/item/trash/genration//ADDITION 04/20/2021 +/obj/item/trash/genration name = "generic ration bag" icon_state = "genration" -/obj/item/trash/meatration//ADDITION 04/20/2021 +/obj/item/trash/meatration name = "meat ration bag" icon_state = "meatration" -/obj/item/trash/vegration//ADDITION 04/20/2021 +/obj/item/trash/vegration name = "veggie ration bag" icon_state = "vegration" @@ -405,4 +405,4 @@ /obj/item/trash/candybowl name = "candy bowl" - icon_state = "candy_bowl" \ No newline at end of file + icon_state = "candy_bowl" diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 699f00695f..1f34b67c09 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -430,8 +430,8 @@ AI MODULES /******************** Syndicate Directives ********************/ /obj/item/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 94d7f3cb5c..1af3018310 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -234,7 +234,7 @@ color = reagents.get_color() update_icon() -/obj/item/storage/box/pocky //ADDITION 04/17/2021 +/obj/item/storage/box/pocky name = "\improper Totemo yoi Pocky" desc = "A bundle of chocolate-coated bisquit sticks." icon = 'icons/obj/food_snacks.dmi' @@ -249,7 +249,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 = "pocky" diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index f29014befc..92ffb27376 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 a35f817216..9636ff2268 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -149,7 +149,7 @@ /obj/item/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 a9a030a4bc..47d5a438d0 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -217,9 +217,9 @@ return name /obj/item/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) \ No newline at end of file + 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 2c10bdd359..6cadbf4f47 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -317,7 +317,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. @@ -1095,7 +1095,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 = {" @@ -1111,7 +1111,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.
    @@ -1127,7 +1127,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 28fa166344..01c5f1a8c1 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -1,6 +1,6 @@ /obj/item/storage/toolbox name = "toolbox" - desc = "Danger. Very robust." + desc = "A metal toolbox with remarkably robust construction." icon = 'icons/obj/storage.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 b8d6924c16..8f81c2b9cc 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -297,7 +297,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 6a6023ba17..e4ce59a3bd 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -255,12 +255,12 @@ /obj/structure/sign/redcross name = "medbay" - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." + desc = "An international 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 international 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 48135496c3..29fa790b22 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -188,7 +188,7 @@ var/global/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( @@ -199,7 +199,7 @@ var/global/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 @@ -212,8 +212,8 @@ var/global/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 @@ -274,7 +274,7 @@ var/global/list/flooring_types /decl/flooring/carpet name = "carpet" - desc = "Imported and comfy." + desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning." icon = 'icons/turf/flooring/carpet.dmi' icon_base = "carpet" build_type = /obj/item/stack/tile/carpet @@ -298,7 +298,7 @@ var/global/list/flooring_types build_type = /obj/item/stack/tile/carpet/blucarpet /decl/flooring/carpet/turcarpet - name = "tur carpet" + name = "turquoise carpet" icon_base = "turcarpet" build_type = /obj/item/stack/tile/carpet/turcarpet @@ -308,7 +308,7 @@ var/global/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 @@ -364,18 +364,19 @@ var/global/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 @@ -502,8 +503,7 @@ var/global/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 @@ -569,7 +569,7 @@ var/global/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 @@ -581,8 +581,8 @@ var/global/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 = TRUE - plating_type = /decl/flooring/concrete \ No newline at end of file + plating_type = /decl/flooring/concrete diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 762859c095..b2cffa5a05 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -209,6 +209,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 c054d92f98..90bfe97f9f 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 ac40892fac..e8154c2d3b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -93,7 +93,7 @@ icon = 'icons/obj/clothing/spacesuits.dmi' icon_state = "syndicate" default_worn_icon = 'icons/mob/spacesuit.dmi' - 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/flashlight,/obj/item/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 a52279eab2..fd88802f4a 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -855,9 +855,6 @@ /obj/item/reagent_containers/pill/adminordrazine = 10, /obj/item/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." @@ -872,8 +869,6 @@ /obj/item/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 cutesy vending machine loaded with high sucrose low calorie - for lack of a better word - 'snacks'." @@ -908,8 +903,6 @@ /obj/item/reagent_containers/food/snacks/packaged/mochicake = 10 ) -////////////////////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." @@ -947,10 +940,6 @@ /obj/item/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." @@ -990,8 +979,6 @@ /obj/item/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!" @@ -1038,21 +1025,19 @@ /obj/item/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?" description_fluff = "Originally the product of a genuine rim-world commune, BODA vendors have been produced by the Gilthari Exports luxury vending division for almost two centuries." icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021 - /obj/item/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021 - contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021 + products = list(/obj/item/reagent_containers/food/drinks/cans/boda = 30, + /obj/item/reagent_containers/food/drinks/cans/kompot = 20) + contraband = list(/obj/item/reagent_containers/food/drinks/cans/kvass = 20) 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 = "A corporate ration vendor unit. Extremely functional." description_fluff = "Designed for use on remote, utilitarian corporate facilities. Perfect for extracting a little extra back from indentured miners. Often modified to accept only company scrip." @@ -1065,8 +1050,6 @@ contraband = list(/obj/item/reagent_containers/food/snacks/packaged/sweetration = 2, /obj/item/reagent_containers/food/snacks/canned/ntbeans = 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." @@ -1095,9 +1078,6 @@ /obj/item/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 b8d82b8036..d16dcc2ef3 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -198,7 +198,7 @@ /obj/item/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 71258879b5..16027ec0ef 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6497,7 +6497,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) @@ -6671,7 +6671,7 @@ .=..() reagents.add_reagent("capsaicin", 5) -/obj/item/reagent_containers/food/snacks/sun_snax //ADDITION 04/14/2021 +/obj/item/reagent_containers/food/snacks/sun_snax name = "\improper Sun Snax!" icon = 'icons/obj/food_snacks.dmi' icon_state = "sun_snax" @@ -6771,7 +6771,7 @@ .=..() reagents.add_reagent("capsaicin",1) -/obj/item/reagent_containers/food/snacks/wasabi_peas //ADDITION 04/14/2021 +/obj/item/reagent_containers/food/snacks/wasabi_peas name = "\improper Hadokikku Peas" icon = 'icons/obj/food_snacks.dmi' icon_state = "wasabi_peas" @@ -6983,7 +6983,7 @@ /obj/item/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 filling_color = "#330066" center_of_mass = list("x"=15, "y"=9) @@ -7815,4 +7815,4 @@ icon_state = "kirani_jellypuff" nutriment_amt = 8 bitesize = 2 - nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) \ No newline at end of file + nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) 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 b806b7418b..c84cbee0a1 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -471,7 +471,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 a9f1046f3d..6628053fbd 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -716,7 +716,7 @@ var/global/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 4cd19a9a70..598eb01e2a 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -113,7 +113,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 d8128ea5e6..d1f2ff1d6c 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -17,7 +17,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 @@ -82,4 +82,4 @@ var/inventory_panel_type = /datum/inventory_panel var/datum/inventory_panel/inventory_panel - var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown. \ No newline at end of file + var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown. diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 04281884b2..bfe7dc5811 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -435,6 +435,6 @@ icon_state = "weldtank" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispenser/he3/Initialize() - ..() +/obj/structure/reagent_dispensers/he3/Initialize() + . = ..() reagents.add_reagent("helium3",1000) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index bea39e521f..90e0c8aa9c 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -4440,8 +4440,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" @@ -4519,4 +4517,4 @@ id = "gauli_juice" description = "Juice from a ga'uli pod, used in skrellian and teshari cooking." color = "#6f83a6" - taste_description = "mintyness" \ No newline at end of file + taste_description = "mintyness" 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 1e363f35c9..fd52efca22 100644 --- a/code/modules/xgm/xgm_gas_mixture.dm +++ b/code/modules/xgm/xgm_gas_mixture.dm @@ -420,10 +420,10 @@ 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) - //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD. + //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 RETARD + //WOOT WOOT TOUCH THIS AND YOU ARE A MISCHIEVIOUS LITTLE ELF for(var/g in avg_gas) gas[g] = max(0, (gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g])