diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 9a33bdc1589..531a6c32d08 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -46888,7 +46888,7 @@ /area/library) "cAu" = ( /obj/structure/table/wood, -/obj/item/clothing/head/pharoah, +/obj/item/clothing/head/pharaoh, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 5 diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 4ff69680ce6..e7315c6bb1d 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -6,7 +6,7 @@ Confusion Little bit hidden. Lowers resistance. Decreases stage speed. - Not very transmittable. + Not very transmissibile. Intense Level. Bonus diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 1633b413520..83d93c55e09 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -6,7 +6,7 @@ Coughing Noticable. Little Resistance. Doesn't increase stage speed much. - Transmittable. + Transmissibile. Low Level. BONUS diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index c1952bf716a..1ede16999d1 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -6,7 +6,7 @@ Itching Not noticable or unnoticable. Resistant. Increases stage speed. - Little transmittable. + Little transmissibility. Low Level. BONUS diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index 3648f5d707f..8fe70c542f9 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -6,7 +6,7 @@ Sneezing Very Noticable. Increases resistance. Doesn't increase stage speed. - Very transmittable. + Very transmissible. Low Level. Bonus diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 53e79f0cc17..04b0778ccdf 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -6,7 +6,7 @@ Vomiting Very Very Noticable. Decreases resistance. Doesn't increase stage speed. - Little transmittable. + Little transmissibility. Medium Level. Bonus diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index e413891e757..788107c4b6a 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -8,7 +8,7 @@ agent = "Fungal Tubercle bacillus Cosmosis" viable_mobtypes = list(/mob/living/carbon/human) cure_chance = 5//like hell are you getting out of hell - desc = "A rare highly transmittable virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue." + desc = "A rare highly transmissible virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue." required_organs = list(/obj/item/organ/lungs) severity = DISEASE_SEVERITY_BIOHAZARD bypasses_immunity = TRUE // TB primarily impacts the lungs; it's also bacterial or fungal in nature; viral immunity should do nothing. diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 3e557b88967..dc7056784a3 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -132,7 +132,7 @@ user.visible_message("[user] starts [welded ? "unwelding" : "welding"] [src].", "You start welding [src].") if(W.use_tool(src, user, 40, volume=50)) welded = !welded - to_chat(user, "[user] [welded?"welds":"unwelded"] [src].", "You [welded ? "weld" : "unweld"] [src].") + to_chat(user, "[user] [welded?"welds":"unwelds"] [src].", "You [welded ? "weld" : "unweld"] [src].") update_icon() /obj/machinery/door/firedoor/try_to_crowbar(obj/item/I, mob/user) diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index 730ee91e83b..4d09daa7f7e 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -15,7 +15,7 @@ icon_state = "impact_omni" /obj/effect/projectile/impact/xray - name = "X-ray impact" + name = "\improper X-ray impact" icon_state = "impact_xray" /obj/effect/projectile/impact/pulse diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index ba166224fc2..4c07c8c56d3 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -24,7 +24,7 @@ icon_state = "beam_omni" /obj/effect/projectile/tracer/xray - name = "X-ray laser" + name = "\improper X-ray laser" icon_state = "xray" /obj/effect/projectile/tracer/pulse diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 1b4bb55f99a..fb4f4f85664 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -9,7 +9,7 @@ #define RAD_GRACE_PERIOD 2 /obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis - name = "geiger counter" + name = "\improper Geiger counter" desc = "A handheld device used for detecting and measuring radiation pulses." icon = 'icons/obj/device.dmi' icon_state = "geiger_off" diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 92770950766..ebae70ca052 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -160,7 +160,7 @@ /obj/item/dnainjector/antitour name = "\improper DNA injector (Anti-Tour.)" - desc = "Will cure Tourret's." + desc = "Will cure Tourette's." remove_mutations_static = list(TOURETTES) /obj/item/dnainjector/tourmut diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 01f1c8dcff9..0842bdc102d 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -307,7 +307,7 @@ slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/katana - name = "\proper Hanzo steel" + name = "\improper Hanzo steel" desc = "Capable of cutting clean through a holy claymore." icon_state = "katana" item_state = "katana" diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index d6bb54bddf5..1171bd7bf79 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -38,7 +38,7 @@ return ..() /obj/item/shield/riot/roman - name = "roman shield" + name = "\improper Roman shield" desc = "Bears an inscription on the inside: \"Romanes venio domus\"." icon_state = "roman_shield" item_state = "roman_shield" diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 7ae18a481ea..c9a2ad54ffe 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -17,7 +17,7 @@ icon_state = "syndicate" /obj/structure/closet/gimmick/russian - name = "russian surplus closet" + name = "\improper Russian surplus closet" desc = "It's a storage unit for Russian standard-issue surplus." /obj/structure/closet/gimmick/russian/PopulateContents() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 4ce98bec52e..faf5574374d 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -164,7 +164,7 @@ new /obj/item/encryptionkey/headset_med(src) /obj/structure/closet/secure_closet/detective - name = "\proper detective's cabinet" + name = "\improper detective's cabinet" req_access = list(ACCESS_FORENSICS_LOCKERS) icon_state = "cabinet" resistance_flags = FLAMMABLE diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 140e3bab37c..6202260ef6e 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -334,7 +334,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/head/helmet/space/hardsuit/cult - name = "nar-sien hardened helmet" + name = "\improper Nar-Sien hardened helmet" desc = "A heavily-armored helmet worn by warriors of the Nar-Sien cult. It can withstand hard vacuum." icon_state = "cult_helmet" item_state = "cult_helmet" @@ -343,7 +343,7 @@ actions_types = list() /obj/item/clothing/suit/space/hardsuit/cult - name = "nar-sien hardened armor" + name = "\improper Nar-Sien hardened armor" icon_state = "cult_armor" item_state = "cult_armor" desc = "A heavily-armored exosuit worn by warriors of the Nar-Sien cult. It can withstand hard vacuum." diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index e0eb886ca03..6908c5eebf0 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -310,7 +310,7 @@ the new instance inside the host to be updated to the template's stats. Resistance: [DT.totalResistance()]
\ Stealth: [DT.totalStealth()]
\ Stage Speed: [DT.totalStageSpeed()]
\ - Transmittability: [DT.totalTransmittable()]
\ + Transmissibility: [DT.totalTransmittable()]
\ Cure: [DT.cure_text]" dat += "

Adaptations

\ Points: [points] / [total_points]\ diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm index e046e09af2b..8f078a2668b 100644 --- a/code/modules/cargo/bounties/virus.dm +++ b/code/modules/cargo/bounties/virus.dm @@ -73,7 +73,7 @@ return A.totalStealth() == stat_value /datum/bounty/virus/transmit - stat_name = "transmittable" + stat_name = "transmissible" /datum/bounty/virus/transmit/accepts_virus(V) var/datum/disease/advance/A = V diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index d0236723b81..03eca5200c8 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -172,7 +172,7 @@ /datum/supply_pack/emergency/radiation name = "Radiation Protection Crate" - desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this." + desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this." cost = 1000 contains = list(/obj/item/clothing/head/radiation, /obj/item/clothing/head/radiation, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 31c6d5c8841..25e0dbe8864 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -150,7 +150,7 @@ dog_fashion = null /obj/item/clothing/head/helmet/roman - name = "roman helmet" + name = "\improper Roman helmet" desc = "An ancient helmet made of bronze and leather." flags_inv = HIDEEARS|HIDEHAIR flags_cover = HEADCOVERSEYES @@ -166,7 +166,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) /obj/item/clothing/head/helmet/roman/legionnaire - name = "roman legionnaire helmet" + name = "\improper Roman legionnaire helmet" desc = "An ancient helmet made of bronze and leather. Has a red crest on top of it." icon_state = "roman_c" item_state = "roman_c" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8cca54f6947..ba23338415e 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -305,8 +305,8 @@ icon_state = "drfreeze_hat" flags_inv = HIDEHAIR -/obj/item/clothing/head/pharoah - name = "pharoah hat" +/obj/item/clothing/head/pharaoh + name = "pharaoh hat" desc = "Walk like an Egyptian." icon_state = "pharoah_hat" icon_state = "pharoah_hat" @@ -318,7 +318,7 @@ dynamic_hair_suffix = "" /obj/item/clothing/head/nemes - name = "headress of Nemes" + name = "headdress of Nemes" desc = "Lavish space tomb not included." icon_state = "nemes_headdress" icon_state = "nemes_headdress" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 1b28c71c4bd..a598bd09596 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -17,13 +17,13 @@ item_state = "labcoat_cmo" /obj/item/clothing/suit/toggle/labcoat/emt - name = "EMT's jacket" + name = "\improper EMT's jacket" desc = "A dark blue jacket with reflective strips for emergency medical technicians." icon_state = "labcoat_emt" item_state = "labcoat_cmo" /obj/item/clothing/suit/toggle/labcoat/mad - name = "\improper The Mad's labcoat" + name = "\proper The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labgreen" item_state = "labgreen" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 5f6183fd1d4..112a2790af1 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -311,7 +311,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR /obj/item/clothing/suit/security/officer/russian - name = "russian officer's jacket" + name = "\improper Russian officer's jacket" desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor." icon_state = "officertanjacket" item_state = "officertanjacket" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 875fcad37cc..57ead15de81 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -38,7 +38,7 @@ can_adjust = FALSE /obj/item/clothing/under/roman - name = "roman armor" + name = "\improper Roman armor" desc = "Ancient Roman armor. Made of metallic and leather straps." icon_state = "roman" item_color = "roman" @@ -667,7 +667,7 @@ icon = 'icons/obj/device.dmi' /obj/item/clothing/under/rank/security/navyblue/russian - name = "russian officer's uniform" + name = "\improper Russian officer's uniform" desc = "The latest in fashionable russian outfits." icon_state = "hostanclothes" item_state = "hostanclothes" diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7a04135c2e3..a89459d5581 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -305,7 +305,7 @@ locked = FALSE obj_flags |= EMAGGED if(user) - user.visible_message("[user.name] emagged [src].","You short out the lock.") + user.visible_message("[user.name] emags [src].","You short out the lock.") /obj/machinery/power/emitter/prototype diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 3540938230d..18cd6d22a6c 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -209,7 +209,7 @@ user.visible_message("[user] wrenches the solar assembly into place.", "You wrench the solar assembly into place.") W.play_tool_sound(src, 75) else - user.visible_message("[user] unwrenched the solar assembly from its place.", "You unwrench the solar assembly from its place.") + user.visible_message("[user] unwrenches the solar assembly from its place.", "You unwrench the solar assembly from its place.") W.play_tool_sound(src, 75) return 1 diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm index 976f80f4377..a98fd29e99a 100644 --- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm +++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm @@ -5,13 +5,13 @@ max_ammo = 6 /obj/item/ammo_box/magazine/internal/cylinder/rev762 - name = "nagant revolver cylinder" + name = "\improper Nagant revolver cylinder" ammo_type = /obj/item/ammo_casing/n762 caliber = "n762" max_ammo = 7 /obj/item/ammo_box/magazine/internal/cylinder/rus357 - name = "russian revolver cylinder" + name = "\improper Russian revolver cylinder" ammo_type = /obj/item/ammo_casing/a357 caliber = "357" max_ammo = 6 diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index a4fcdd02666..24ef2a26047 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -27,7 +27,7 @@ can_suppress = FALSE /obj/item/gun/ballistic/automatic/pistol/deagle - name = "desert eagle" + name = "\improper Desert Eagle" desc = "A robust .50 AE handgun." icon_state = "deagle" force = 14 @@ -44,7 +44,7 @@ icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" /obj/item/gun/ballistic/automatic/pistol/deagle/gold - desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." + desc = "A gold plated Desert Eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." icon_state = "deagleg" item_state = "deagleg" @@ -55,7 +55,7 @@ /obj/item/gun/ballistic/automatic/pistol/APS name = "stechkin APS pistol" - desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo." + desc = "The original Russian version of a widely used Syndicate sidearm. Uses 9mm ammo." icon_state = "aps" w_class = WEIGHT_CLASS_SMALL mag_type = /obj/item/ammo_box/magazine/pistolm9mm diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index b359d00602e..cd115223421 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -151,7 +151,7 @@ pin = /obj/item/firing_pin /obj/item/gun/ballistic/revolver/nagant - name = "nagant revolver" + name = "\improper Nagant revolver" desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo." icon_state = "nagant" can_suppress = TRUE @@ -163,7 +163,7 @@ // You can spin the chamber to randomize the position of the bullet. /obj/item/gun/ballistic/revolver/russian - name = "\improper russian revolver" + name = "\improper Russian revolver" desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull." mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357 var/spun = FALSE @@ -233,7 +233,7 @@ user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "You fire [src] at your head!", "You hear a gunshot!") /obj/item/gun/ballistic/revolver/russian/soul - name = "cursed russian revolver" + name = "cursed Russian revolver" desc = "To play with this revolver requires wagering your very soul." /obj/item/gun/ballistic/revolver/russian/soul/shoot_self(mob/living/user) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index aa1ea7acacd..c766d1c94e4 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -101,7 +101,7 @@ transform *= 1 + ((damage/7) * 0.2)//20% larger per tile /obj/item/gun/energy/xray - name = "X-ray laser gun" + name = "\improper X-ray laser gun" desc = "A high-power laser gun capable of expelling concentrated X-ray blasts that pass through multiple soft targets and heavier materials." icon_state = "xray" item_state = null diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index ef35437af69..b51eaf40ae5 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -51,7 +51,7 @@ damage = 5 /obj/item/projectile/beam/xray - name = "X-ray beam" + name = "\improper X-ray beam" icon_state = "xray" damage = 15 irradiate = 30 diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 5092b533743..d38e76ae6e2 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -98,7 +98,7 @@ owner.flash_act(visual = 1) /obj/item/organ/eyes/robotic/xray - name = "X-ray eyes" + name = "\improper X-ray eyes" desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile." eye_color = "000" see_in_dark = 8