diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 2177c15d596..12b1176fc2d 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -420,7 +420,7 @@ item_state = "claymorered" /obj/item/holo/esword - name = "Holographic Energy Sword" + name = "holographic energy sword" desc = "This looks like a real energy sword!" icon_state = "sword0" hitsound = "swing_hit" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index d7b31167944..027259adb79 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -720,7 +720,7 @@ GLOBAL_LIST_EMPTY(turret_icons) return A /obj/machinery/porta_turret/centcom - name = "Centcom Turret" + name = "\improper Centcomm turret" enabled = FALSE ailock = TRUE check_synth = FALSE @@ -732,7 +732,7 @@ GLOBAL_LIST_EMPTY(turret_icons) region_max = REGION_CENTCOMM // Non-turretcontrolled turrets at CC can have their access customized to check for CC accesses. /obj/machinery/porta_turret/centcom/pulse - name = "Pulse Turret" + name = "pulse turret" health = 200 enabled = TRUE lethal = TRUE diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 9294bb66804..4b775c412dd 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -440,7 +440,7 @@ range_flame = 2 /obj/item/bombcore/emp - name = "EMP bomb core" + name = "\improper EMP bomb core" var/light_emp = 36 var/heavy_emp = 18 var/pulse_number = 1 //Since one EMP wont destroy anything other then consoles and IPCS, here is an option to have multiple pulses when dentonating. DO NOT USE THIS WITH REALLY LARGE AREAS diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 82ea2364954..98728dfbdf9 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -1,7 +1,7 @@ #define CHRONO_BEAM_RANGE 3 #define CHRONO_FRAME_COUNT 22 /obj/item/chrono_eraser - name = "Timestream Eradication Device" + name = "\improper Timestream Eradication Device" desc = "The result of outlawed time-bluespace research, this device is capable of wiping a being from the timestream. They never are, they never were, they never will be." icon = 'icons/obj/chronos.dmi' icon_state = "chronobackpack" @@ -41,7 +41,7 @@ /obj/item/gun/energy/chrono_gun - name = "T.E.D. Projection Apparatus" + name = "\improper T.E.D. Projection Apparatus" desc = "It's as if they never existed in the first place." icon = 'icons/obj/chronos.dmi' icon_state = "chronogun" diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 6b8f0fd33b2..8d59fe05689 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -104,7 +104,7 @@ payload = /obj/item/grenade/chem_grenade/cleaner /obj/item/grenade/clusterbuster/teargas - name = "Oignon Teargas Grenade" + name = "\improper Oignon Teargas Grenade" payload = /obj/item/grenade/chem_grenade/teargas /obj/item/grenade/clusterbuster/facid @@ -124,23 +124,23 @@ payload = /obj/item/grenade/spawnergrenade/spesscarp /obj/item/grenade/clusterbuster/monster - name = "Monster Megabomb" + name = "\improper Monster Megabomb" payload = /obj/item/grenade/chem_grenade/large/monster /obj/item/grenade/clusterbuster/meat - name = "Mega Meat Grenade" + name = "\improper Mega Meat Grenade" payload = /obj/item/grenade/chem_grenade/meat /obj/item/grenade/clusterbuster/nervegas - name = "Nerve Gas Clusterbomb" + name = "\improper Nerve Gas Clusterbomb" payload = /obj/item/grenade/chem_grenade/saringas /obj/item/grenade/clusterbuster/megadirt - name = "Megamaid's Revenge Grenade" + name = "\improper Megamaid's Revenge Grenade" payload = /obj/item/grenade/chem_grenade/dirt /obj/item/grenade/clusterbuster/ultima - name = "Earth Shattering Kaboom" + name = "\improper Earth Shattering Kaboom" desc = "Contains one Aludium Q-36 explosive space modulator." payload = /obj/item/grenade/chem_grenade/explosion @@ -150,12 +150,12 @@ payload = /obj/item/grenade/chem_grenade/lube /obj/item/grenade/clusterbuster/hippie - name = "Hippie Grenade" + name = "\improper Hippie Grenade" desc = "Almost as good as the summer of '69." payload = /obj/item/grenade/chem_grenade/drugs /obj/item/grenade/clusterbuster/holy - name = "Purification Grenade" + name = "\improper Purification Grenade" desc = "Blessed excessively." payload = /obj/item/grenade/chem_grenade/holywater @@ -165,52 +165,52 @@ payload = /obj/item/grenade/chem_grenade/hellwater /obj/item/grenade/clusterbuster/booze - name = "Booze Grenade" + name = "\improper Booze Grenade" payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink /obj/item/grenade/clusterbuster/honk - name = "Mega Honk Grenade" + name = "\improper Mega Honk Grenade" payload = /obj/item/grown/bananapeel /obj/item/grenade/clusterbuster/honk_evil - name = "Evil Mega Honk Grenade" + name = "\improper Evil Mega Honk Grenade" payload = /obj/item/grenade/clown_grenade /obj/item/grenade/clusterbuster/xmas - name = "Christmas Miracle" + name = "\improper Christmas Miracle" payload = /obj/item/a_gift /obj/item/grenade/clusterbuster/dirt - name = "Megamaid's Job Security Grenade" + name = "\improper Megamaid's Job Security Grenade" payload = /obj/effect/decal/cleanable/random /obj/item/grenade/clusterbuster/apocalypsefake - name = "Fun Bomb" + name = "\improper Fun Bomb" desc = "Not like the other bomb." payload = /obj/item/toy/spinningtoy /obj/item/grenade/clusterbuster/apocalypse - name = "Apocalypse Bomb" + name = "\improper Apocalypse Bomb" desc = "No matter what, do not EVER use this." payload = /obj/singularity /obj/item/grenade/clusterbuster/tools - name = "Quick Repair Grenade" + name = "\improper Quick Repair Grenade" desc = "An assistant's every dream." payload = /obj/random/tool /obj/item/grenade/clusterbuster/tools - name = "Engineering Deployment Platfom" + name = "\improper Engineering Deployment Platfom" desc = "For the that time when gearing up was just too hard." payload = /obj/random/tech_supply /obj/item/grenade/clusterbuster/toys - name = "Toy Delivery System" + name = "\improper Toy Delivery System" desc = "Who needs skill at arcades anyway?" payload = /obj/item/toy/random /obj/item/grenade/clusterbuster/banquet - name = "Bork Bork Bonanza" + name = "\improper Bork Bork Bonanza" desc = "Bork bork bork." payload = /obj/item/grenade/clusterbuster/banquet/child @@ -218,44 +218,44 @@ payload = /obj/item/grenade/chem_grenade/large/feast /obj/item/grenade/clusterbuster/aviary - name = "Poly-Poly Grenade" + name = "\improper Poly-Poly Grenade" desc = "That's an uncomfortable number of birds." payload = /mob/living/simple_animal/parrot /obj/item/grenade/clusterbuster/monkey - name = "Barrel of Monkeys" + name = "\improper Barrel of Monkeys" desc = "Not really that much fun." payload = /mob/living/carbon/human/monkey /obj/item/grenade/clusterbuster/fluffy - name = "Fluffy Love Bomb" + name = "\improper Fluffy Love Bomb" desc = "Exactly as snuggly as it sounds." payload = /mob/living/simple_animal/pet/dog/corgi/puppy /obj/item/grenade/clusterbuster/fox - name = "Troublemaking Grenade" + name = "\improper Troublemaking Grenade" desc = "More trouble than two foxes combined." payload = /mob/living/simple_animal/pet/dog/fox /obj/item/grenade/clusterbuster/crab - name = "Crab Grenade" + name = "\improper Crab Grenade" desc = "Reserved for those pesky request." payload = /mob/living/simple_animal/crab /obj/item/grenade/clusterbuster/plasma - name = "Plasma Cluster Grenade" + name = "\improper Plasma Cluster Grenade" desc = "For when everything needs to die in a fire." payload = /obj/item/grenade/gas /obj/item/grenade/clusterbuster/n2o - name = "N2O Cluster Grenade" + name = "\improper N2O Cluster Grenade" desc = "For when you need to knock out EVERYONE." payload = /obj/item/grenade/gas/knockout ////////////Clusterbuster of Clusterbusters//////////// /obj/item/grenade/clusterbuster/mega_fox - name = "Mega Troublemaking Grenade." + name = "\improper Mega Troublemaking Grenade." payload = /obj/item/grenade/clusterbuster/fox /obj/item/grenade/clusterbuster/mega_bang @@ -267,7 +267,7 @@ payload = /obj/item/grenade/clusterbuster/syndieminibomb /obj/item/grenade/clusterbuster/mega_honk_evil - name = "Mega Evil Mega Honk Grenade." + name = "\improper Mega Evil Mega Honk Grenade." payload = /obj/item/grenade/clusterbuster/honk_evil /obj/item/grenade/clusterbuster/mega_emp diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm index b5598bc86be..bb6674ad56a 100644 --- a/code/game/objects/items/weapons/grenades/custom_grenades.dm +++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm @@ -275,7 +275,7 @@ // -------------------------------------- /obj/item/storage/box/syndie_kit/remotegrenade - name = "Remote Grenade Kit" + name = "remote grenade kit" /obj/item/storage/box/syndie_kit/remotegrenade/New() ..() @@ -285,7 +285,7 @@ return /obj/item/storage/box/syndie_kit/remoteemp - name = "Remote EMP Kit" + name = "remote EMP kit" /obj/item/storage/box/syndie_kit/remoteemp/New() ..() @@ -295,7 +295,7 @@ return /obj/item/storage/box/syndie_kit/remotelube - name = "Remote Lube Kit" + name = "remote lube kit" /obj/item/storage/box/syndie_kit/remotelube/New() ..() diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index 558f75b3ce3..1c9bba7d654 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -13,7 +13,7 @@ // Grants the wielder the Highlander Style Martial Art /obj/item/claymore/highlander - name = "Highlander Claymore" + name = "\improper Highlander claymore" desc = "Imbues the wielder with legendary martial prowress and a nigh-unquenchable thirst for glorious battle!" var/datum/martial_art/highlander/style = new diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4531490a9b3..ff7b21dc7bd 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -157,7 +157,7 @@ new /obj/item/dnainjector/h2m(src) /obj/item/storage/box/slug - name = "Ammunition Box (Slug)" + name = "ammunition box (Slug)" desc = "A small box capable of holding seven shotgun shells." icon_state = "slugbox" @@ -166,7 +166,7 @@ new /obj/item/ammo_casing/shotgun(src) /obj/item/storage/box/buck - name = "Ammunition Box (Buckshot)" + name = "ammunition box (Buckshot)" desc = "A small box capable of holding seven shotgun shells." icon_state = "buckshotbox" @@ -175,7 +175,7 @@ new /obj/item/ammo_casing/shotgun/buckshot(src) /obj/item/storage/box/dragonsbreath - name = "Ammunition Box (Dragonsbreath)" + name = "ammunition box (Dragonsbreath)" desc = "A small box capable of holding seven shotgun shells." icon_state = "dragonsbreathbox" @@ -184,7 +184,7 @@ new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) /obj/item/storage/box/stun - name = "Ammunition Box (Stun shells)" + name = "ammunition box (Stun shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "stunbox" @@ -193,7 +193,7 @@ new /obj/item/ammo_casing/shotgun/stunslug(src) /obj/item/storage/box/beanbag - name = "Ammunition Box (Beanbag shells)" + name = "ammunition box (Beanbag shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "beanbagbox" @@ -202,7 +202,7 @@ new /obj/item/ammo_casing/shotgun/beanbag(src) /obj/item/storage/box/rubbershot - name = "Ammunition Box (Rubbershot shells)" + name = "ammunition box (Rubbershot shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "rubbershotbox" @@ -211,7 +211,7 @@ new /obj/item/ammo_casing/shotgun/rubbershot(src) /obj/item/storage/box/tranquilizer - name = "Ammunition Box (Tranquilizer darts)" + name = "ammunition box (Tranquilizer darts)" desc = "A small box capable of holding seven shotgun shells." icon_state = "tranqbox" @@ -512,8 +512,8 @@ new /obj/item/clothing/suit/syndicatefake(src) /obj/item/storage/box/enforcer_rubber - name = "enforcer pistol kit (rubber)" - desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'NON-LETHAL'." + name = "\improper Enforcer pistol kit (rubber)" + desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'NON-LETHAL'." icon_state = "box_ert" /obj/item/storage/box/enforcer_rubber/populate_contents() @@ -522,8 +522,8 @@ new /obj/item/ammo_box/magazine/enforcer(src) /obj/item/storage/box/enforcer_lethal - name = "enforcer pistol kit (lethal)" - desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'LETHAL'." + name = "\improper Enforcer pistol kit (lethal)" + desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'LETHAL'." icon_state = "box_ert" /obj/item/storage/box/enforcer_lethal/populate_contents() diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 7f7bd427845..5e1e561319a 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -147,7 +147,7 @@ new /obj/item/ammo_box/a357(src) /obj/item/storage/box/syndie_kit/boolets - name = "Shotgun shells" + name = "shotgun shells" /obj/item/storage/box/syndie_kit/boolets/populate_contents() for(var/I in 1 to 6) @@ -162,7 +162,7 @@ new /obj/item/implanter/emp/(src) /obj/item/storage/box/syndie_kit/c4 - name = "Pack of C-4 Explosives" + name = "pack of C-4 explosives" /obj/item/storage/box/syndie_kit/c4/populate_contents() for(var/I in 1 to 5) @@ -181,7 +181,7 @@ new /obj/item/restraints/legcuffs/bola/tactical(src) /obj/item/storage/box/syndie_kit/sarin - name = "Sarin Gas Grenades" + name = "sarin gas grenades" /obj/item/storage/box/syndie_kit/sarin/populate_contents() new /obj/item/grenade/chem_grenade/saringas(src) @@ -220,7 +220,7 @@ /obj/item/storage/box/syndie_kit/atmosn2ogrenades - name = "Atmos N2O Grenades" + name = "atmos N2O grenades" /obj/item/storage/box/syndie_kit/atmosn2ogrenades/populate_contents() new /obj/item/grenade/clusterbuster/n2o(src) @@ -228,7 +228,7 @@ /obj/item/storage/box/syndie_kit/atmosfiregrenades - name = "Plasma Fire Grenades" + name = "plasma fire grenades" /obj/item/storage/box/syndie_kit/atmosfiregrenades/populate_contents() new /obj/item/grenade/clusterbuster/plasma(src) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 7fc97eda5cd..7988e0f2a23 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -518,7 +518,7 @@ /obj/item/twohanded/spear/kidan icon_state = "kidanspear0" - name = "Kidan spear" + name = "\improper Kidan spear" desc = "A spear brought over from the Kidan homeworld." // DIY CHAINSAW @@ -589,7 +589,7 @@ ///CHAINSAW/// /obj/item/twohanded/chainsaw icon_state = "chainsaw0" - name = "Chainsaw" + name = "chainsaw" desc = "Perfect for felling trees or fellow spacemen." force = 15 throwforce = 15 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 1e6a2bf4618..52ed1e9c24c 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -107,7 +107,7 @@ attack_verb = list("jabbed","stabbed","ripped") /obj/item/wirerod - name = "Wired rod" + name = "wired rod" desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" item_state = "rods" @@ -167,7 +167,7 @@ /obj/item/spear/kidan icon_state = "kidanspear" - name = "Kidan spear" + name = "\improper Kidan spear" desc = "A one-handed spear brought over from the Kidan homeworld." icon_state = "kidanspear" item_state = "kidanspear" diff --git a/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm b/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm index 37924f36064..d291e1c15ab 100644 --- a/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm +++ b/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm @@ -174,7 +174,7 @@ "} /obj/item/gun/energy/laser/awaymission_aeg - name = "Wireless Energy Gun" + name = "wireless energy gun" desc = "An energy gun that recharges wirelessly during away missions. Does not work on the main station." force = 10 origin_tech = null diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm index 15dac122c54..a32f5e5eec1 100644 --- a/code/modules/awaymissions/mission_code/challenge.dm +++ b/code/modules/awaymissions/mission_code/challenge.dm @@ -23,7 +23,7 @@ /obj/machinery/power/emitter/energycannon - name = "Energy Cannon" + name = "energy cannon" desc = "A heavy duty industrial laser" icon = 'icons/obj/singularity.dmi' icon_state = "emitter" diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 1f440d5496d..adc2b035df4 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -86,8 +86,8 @@ //Lasers /obj/item/gun/energy/laser/practice/sc_laser - name = "Old laser" - desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly." + name = "old laser" + desc = "A once potent weapon, years of dust have collected in the chamber and lens, weakening the beam significantly." clumsy_check = 0 /* diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index f8ac106a9e8..1eb2fa6ca0c 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -32,9 +32,9 @@ new /obj/item/bedsheet/cult(src) if(8) if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) + new /obj/item/disk/design_disk/modkit_disk/resonator_blast(src) else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) + new /obj/item/disk/design_disk/modkit_disk/rapid_repeater(src) if(9) new /obj/item/rod_of_asclepius(src) if(10) @@ -51,9 +51,9 @@ new /obj/item/guardiancreator(src) if(16) if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) + new /obj/item/disk/design_disk/modkit_disk/mob_and_turf_aoe(src) else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) + new /obj/item/disk/design_disk/modkit_disk/bounty(src) if(17) new /obj/item/warp_cube/red(src) if(18) @@ -91,30 +91,30 @@ new /obj/item/prisoncube(src) //KA modkit design discs -/obj/item/disk/design_disk/modkit_disc - name = "KA Mod Disk" - desc = "A design disc containing the design for a unique kinetic accelerator modkit. It's compatible with a research console." +/obj/item/disk/design_disk/modkit_disk + name = "\improper KA mod disk" + desc = "A design disk containing the design for a unique kinetic accelerator modkit. It's compatible with a research console." icon_state = "datadisk1" var/modkit_design = /datum/design/unique_modkit -/obj/item/disk/design_disk/modkit_disc/New() +/obj/item/disk/design_disk/modkit_disk/New() . = ..() blueprint = new modkit_design -/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe - name = "Offensive Mining Explosion Mod Disk" +/obj/item/disk/design_disk/modkit_disk/mob_and_turf_aoe + name = "\improper KA mod disk (Offensive mining explosion)" modkit_design = /datum/design/unique_modkit/offensive_turf_aoe -/obj/item/disk/design_disk/modkit_disc/rapid_repeater - name = "Rapid Repeater Mod Disk" +/obj/item/disk/design_disk/modkit_disk/rapid_repeater + name = "\improper KA mod disk (Rapid repeater)" modkit_design = /datum/design/unique_modkit/rapid_repeater -/obj/item/disk/design_disk/modkit_disc/resonator_blast - name = "Resonator Blast Mod Disk" +/obj/item/disk/design_disk/modkit_disk/resonator_blast + name = "\improper KA mod disk (Resonator blast)" modkit_design = /datum/design/unique_modkit/resonator_blast -/obj/item/disk/design_disk/modkit_disc/bounty - name = "Death Syphon Mod Disk" +/obj/item/disk/design_disk/modkit_disk/bounty + name = "\improper KA mod disk (Death syphon)" modkit_design = /datum/design/unique_modkit/bounty /datum/design/unique_modkit diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index fc1b3594bad..59f46e440f0 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -235,7 +235,7 @@ muzzle_flash_color = LIGHT_COLOR_FIRE /obj/item/ammo_casing/shotgun/frag12 - name = "FRAG-12 slug" + name = "\improper FRAG-12 slug" desc = "A high explosive breaching round for a 12 gauge shotgun." icon_state = "heshell" projectile_type = /obj/item/projectile/bullet/frag12 diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 53004b768db..b6f05b22573 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -67,7 +67,7 @@ max_ammo = 14 /obj/item/ammo_box/shotgun - name = "Shotgun Speedloader (slug)" + name = "shotgun speedloader (Slug)" icon_state = "slugloader" origin_tech = "combat=2" ammo_type = /obj/item/ammo_casing/shotgun @@ -76,39 +76,39 @@ multiple_sprites = 1 /obj/item/ammo_box/shotgun/buck - name = "Shotgun Speedloader (buckshot)" + name = "shotgun speedloader (Buckshot)" icon_state = "buckloader" ammo_type = /obj/item/ammo_casing/shotgun/buckshot /obj/item/ammo_box/shotgun/dragonsbreath - name = "Shotgun Speedloader (dragonsbreath)" + name = "shotgun speedloader (Dragonsbreath)" icon_state = "dragonsbreathloader" ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath /obj/item/ammo_box/shotgun/stun - name = "Shotgun Speedloader (stun shells)" + name = "shotgun speedloader (Stun shells)" icon_state = "stunloader" ammo_type = /obj/item/ammo_casing/shotgun/stunslug /obj/item/ammo_box/shotgun/beanbag - name = "Shotgun Speedloader (beanbag shells)" + name = "shotgun speedloader (Beanbag shells)" icon_state = "beanbagloader" ammo_type = /obj/item/ammo_casing/shotgun/beanbag materials = list(MAT_METAL=1750) /obj/item/ammo_box/shotgun/rubbershot - name = "Shotgun Speedloader (rubbershot shells)" + name = "shotgun speedloader (Rubbershot shells)" icon_state = "rubbershotloader" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot materials = list(MAT_METAL=1750) /obj/item/ammo_box/shotgun/tranquilizer - name = "Shotgun Speedloader (tranquilizer darts)" + name = "shotgun speedloader (Tranquilizer darts)" icon_state = "tranqloader" ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer materials = list(MAT_METAL=1750) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index e38451f6adf..ef1d1b44be1 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -290,7 +290,7 @@ icon_state = "uzi9mm-[round(ammo_count(),4)]" /obj/item/ammo_box/magazine/smgm9mm - name = "SMG magazine (9mm)" + name = "\improper SMG magazine (9mm)" icon_state = "smg9mm" ammo_type = /obj/item/ammo_casing/c9mm caliber = "9mm" @@ -298,17 +298,17 @@ materials = list(MAT_METAL = 2000) /obj/item/ammo_box/magazine/smgm9mm/ap - name = "SMG magazine (Armour Piercing 9mm)" + name = "\improper SMG magazine (Armour Piercing 9mm)" ammo_type = /obj/item/ammo_casing/c9mm/ap materials = list(MAT_METAL = 3000) /obj/item/ammo_box/magazine/smgm9mm/toxin - name = "SMG magazine (Toxin Tipped 9mm)" + name = "\improper SMG magazine (Toxin Tipped 9mm)" ammo_type = /obj/item/ammo_casing/c9mm/tox materials = list(MAT_METAL = 3000) /obj/item/ammo_box/magazine/smgm9mm/fire - name = "SMG Magazine (Incendiary 9mm)" + name = "\improper SMG Magazine (Incendiary 9mm)" ammo_type = /obj/item/ammo_casing/c9mm/inc materials = list(MAT_METAL = 3000) @@ -328,7 +328,7 @@ icon_state = "9x19p-[ammo_count() ? "8" : "0"]" /obj/item/ammo_box/magazine/smgm45 - name = "SMG magazine (.45)" + name = "\improper SMG magazine (.45)" icon_state = "c20r45" origin_tech = "combat=2" ammo_type = /obj/item/ammo_casing/c45 @@ -373,7 +373,7 @@ multiple_sprites = 2 /obj/item/ammo_box/magazine/m556/arg - name = "ARG magazine (5.56mm)" + name = "\improper ARG magazine (5.56mm)" icon_state = "arg" /obj/item/ammo_box/magazine/m12g @@ -457,7 +457,7 @@ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot /obj/item/ammo_box/magazine/toy/enforcer - name = "Enforcer Foam magazine" + name = "\improper Enforcer foam magazine" icon_state = "enforcer" max_ammo = 8 multiple_sprites = 1 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 9d7b9bde281..c76b38350d1 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -115,7 +115,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/xray) /obj/item/gun/energy/immolator - name = "Immolator laser gun" + name = "immolator laser gun" desc = "A modified laser gun, shooting highly concetrated beams with higher intensity that ignites the target, for the cost of draining more power per shot" icon_state = "immolator" item_state = "laser" diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index d4cb1b03244..b6f1aee729c 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -72,7 +72,7 @@ can_holster = TRUE /obj/item/gun/energy/gun/blueshield/pdw9 - name = "PDW-9 taser pistol" + name = "\improper PDW-9 taser pistol" desc = "A military grade sidearm, used by many militia forces throughout the local sector." icon_state = "pdw9pistol" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e2323765f82..a4b086bdfad 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -294,7 +294,7 @@ // HONK Rifle // /obj/item/gun/energy/clown - name = "HONK Rifle" + name = "\improper HONK rifle" desc = "Clown Planet's finest." icon_state = "disabler" ammo_type = list(/obj/item/ammo_casing/energy/clown) @@ -317,7 +317,7 @@ // Energy Sniper // /obj/item/gun/energy/sniperrifle - name = "L.W.A.P. Sniper Rifle" + name = "\improper L.W.A.P. sniper rifle" desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope." icon_state = "esniper" origin_tech = "combat=6;materials=5;powerstorage=4" diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm index e12d8fa018c..705254adef4 100644 --- a/code/modules/projectiles/guns/energy/telegun.dm +++ b/code/modules/projectiles/guns/energy/telegun.dm @@ -1,7 +1,7 @@ // Telegun for Tator RDs /obj/item/gun/energy/telegun - name = "Teleporter Gun" + name = "teleporter gun" desc = "An extremely high-tech bluespace energy gun capable of teleporting targets to far off locations." icon_state = "telegun" item_state = "ionrifle" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index df7992a69ae..ff15b033b31 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -234,8 +234,8 @@ //ARG Assault Rifle// /obj/item/gun/projectile/automatic/ar - name = "ARG" - desc = "A robust assault rile used by Nanotrasen fighting forces." + name = "\improper ARG" + desc = "A robust assault rifle used by Nanotrasen fighting forces." icon_state = "arg" item_state = "arg" slot_flags = 0 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b0da123d1ca..9bcbc8e9741 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -31,7 +31,7 @@ //Enforcer// /obj/item/gun/projectile/automatic/pistol/enforcer - name = "Enforcer" + name = "\improper Enforcer" desc = "A pistol of modern design." icon_state = "enforcer_grey" force = 10 @@ -78,7 +78,7 @@ //Desert Eagle// /obj/item/gun/projectile/automatic/pistol/deagle - name = "desert eagle" + name = "\improper Desert Eagle" desc = "A robust .50 AE handgun." icon_state = "deagle" force = 14.0 @@ -93,7 +93,7 @@ icon_state = "[initial(icon_state)][magazine ? "" : "-e"]" /obj/item/gun/projectile/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"