From 42bdf427b8ec6e096ea965edb05e95f8a0602bd7 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 19:10:31 +0100 Subject: [PATCH] Properly decapitalized mecha equipment. --- .../mecha/equipment/tools/medical_tools.dm | 6 +-- code/game/mecha/equipment/tools/tools.dm | 38 +++++++++--------- .../mecha/equipment/tools/unused_tools.dm | 4 +- code/game/mecha/equipment/weapons/weapons.dm | 39 +++++++------------ 4 files changed, 38 insertions(+), 49 deletions(-) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 8a527e1b084..08d6f2cca49 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -1,6 +1,6 @@ /obj/item/mecha_parts/mecha_equipment/tool/sleeper - name = "Mounted Sleeper" - desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)" + name = "mounted sleeper" + desc = "A sleeper. Mountable to an exosuit. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper_0" origin_tech = "programming=2;biotech=3" @@ -373,7 +373,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - name = "Syringe Gun" + name = "syringe gun" desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/gun.dmi' icon_state = "syringegun" diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 3d318a891ac..999df5b8d5a 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1,5 +1,5 @@ /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp - name = "Hydraulic Clamp" + name = "hydraulic clamp" icon_state = "mecha_clamp" equip_cooldown = 15 energy_drain = 10 @@ -64,7 +64,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/drill - name = "Drill" + name = "drill" desc = "This is the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_drill" equip_cooldown = 30 @@ -115,7 +115,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill - name = "Diamond Drill" + name = "diamond drill" desc = "This is an upgraded version of the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_diamond_drill" origin_tech = "materials=4;engineering=3" @@ -166,7 +166,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/extinguisher - name = "Extinguisher" + name = "extinguisher" desc = "Exosuit-mounted extinguisher (Can be attached to: Engineering exosuits)" icon_state = "mecha_exting" equip_cooldown = 5 @@ -240,7 +240,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/rcd - name = "Mounted RCD" + name = "mounted RCD" desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)" icon_state = "mecha_rcd" origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4" @@ -345,7 +345,7 @@ /obj/item/mecha_parts/mecha_equipment/teleporter - name = "Teleporter" + name = "teleporter" desc = "An exosuit module that allows exosuits to teleport to any position in view." icon_state = "mecha_teleport" origin_tech = "bluespace=10" @@ -365,7 +365,7 @@ /obj/item/mecha_parts/mecha_equipment/wormhole_generator - name = "Wormhole Generator" + name = "wormhole generator" desc = "An exosuit module that allows generating of small quasi-stable wormholes." icon_state = "mecha_wholegen" origin_tech = "bluespace=3" @@ -415,7 +415,7 @@ return /obj/item/mecha_parts/mecha_equipment/gravcatapult - name = "Gravitational Catapult" + name = "gravitational catapult" desc = "An exosuit mounted Gravitational Catapult." icon_state = "mecha_teleport" origin_tech = "bluespace=2;magnets=3" @@ -491,8 +491,8 @@ /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants. - name = "Armor Booster Module (Close Combat Weaponry)" - desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." + name = "\improper CCW armor booster" + desc = "Close-combat armor booster. Boosts exosuit armor against armed melee attacks. Requires energy to operate." icon_state = "mecha_abooster_ccw" origin_tech = "materials=3" equip_cooldown = 10 @@ -541,8 +541,8 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster - name = "Armor Booster Module (Ranged Weaponry)" - desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate." + name = "\improper RW armor booster" + desc = "Ranged-weaponry armor booster. Boosts exosuit armor against ranged attacks. Completely blocks taser shots, but requires energy to operate." icon_state = "mecha_abooster_proj" origin_tech = "materials=4" equip_cooldown = 10 @@ -612,8 +612,8 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid - name = "Repair Droid" - desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage." + name = "repair droid" + desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost any type of external or internal damage." icon_state = "repair_droid" origin_tech = "magnets=3;programming=3" equip_cooldown = 20 @@ -702,7 +702,7 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay - name = "Energy Relay" + name = "energy relay" desc = "Wirelessly drains energy from any available power channel in area. The performance index is quite low." icon_state = "tesla" origin_tech = "magnets=4;syndicate=2" @@ -814,7 +814,7 @@ /obj/item/mecha_parts/mecha_equipment/generator - name = "Phoron Generator" + name = "phoron generator" desc = "Generates power using solid phoron as fuel. Pollutes the environment." icon_state = "tesla" origin_tech = "phorontech=2;powerstorage=2;engineering=1" @@ -952,7 +952,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/nuclear - name = "ExoNuclear Reactor" + name = "\improper ExoNuclear reactor" desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" origin_tech = "powerstorage=3;engineering=3" @@ -989,7 +989,7 @@ //This is pretty much just for the death-ripley so that it is harmless /obj/item/mecha_parts/mecha_equipment/tool/safety_clamp - name = "KILL CLAMP" + name = "\improper KILL CLAMP" icon_state = "mecha_clamp" equip_cooldown = 15 energy_drain = 0 @@ -1208,4 +1208,4 @@ if (OCCUPIED|LOCKED) usr << "\red All of the passenger compartments are already occupied or locked!" if (0) - usr << "\red \The [src] doesn't have a passenger compartment." \ No newline at end of file + usr << "\red \The [src] doesn't have a passenger compartment." diff --git a/code/game/mecha/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm index 470159e06fb..012d7979e1a 100644 --- a/code/game/mecha/equipment/tools/unused_tools.dm +++ b/code/game/mecha/equipment/tools/unused_tools.dm @@ -9,7 +9,7 @@ //NEEDS SPRITE! (When this gets ticked in search for 'TODO MECHA JETPACK SPRITE MISSING' through code to uncomment the place where it's missing.) /obj/item/mecha_parts/mecha_equipment/jetpack - name = "Jetpack" + name = "jetpack" desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight." icon_state = "mecha_equip" equip_cooldown = 5 @@ -108,7 +108,7 @@ /obj/item/mecha_parts/mecha_equipment/defence_shocker - name = "Exosuit Defence Shocker" + name = "exosuit defence shocker" desc = "" icon_state = "mecha_teleport" equip_cooldown = 10 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index da6188263a3..fa4bc3858ce 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -58,12 +58,12 @@ P.process() /obj/item/mecha_parts/mecha_equipment/weapon/energy - name = "General Energy Weapon" + name = "general energy weapon" auto_rearm = 1 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 - name = "CH-PS \"Immolator\" Laser" + name = "\improper CH-PS \"Immolator\" laser" icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam @@ -71,7 +71,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser equip_cooldown = 30 - name = "Jury-rigged Welder-Laser" + name = "jury-rigged welder-Laser" desc = "While not regulation, this inefficient weapon can be attached to working exo-suits in desperate, or malicious, times." icon_state = "mecha_laser" energy_drain = 80 @@ -81,7 +81,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 15 - name = "CH-LC \"Solaris\" Laser Cannon" + name = "\improper CH-LC \"Solaris\" laser cannon" icon_state = "mecha_laser" energy_drain = 60 projectile = /obj/item/projectile/beam/heavylaser @@ -89,7 +89,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion equip_cooldown = 40 - name = "mkIV Ion Heavy Cannon" + name = "mkIV ion heavy cannon" icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion @@ -97,7 +97,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse equip_cooldown = 30 - name = "eZ-13 mk2 Heavy pulse rifle" + name = "eZ-13 mk2 heavy pulse rifle" icon_state = "mecha_pulse" energy_drain = 120 origin_tech = "materials=3;combat=6;powerstorage=4" @@ -117,7 +117,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser - name = "PBT \"Pacifier\" Mounted Taser" + name = "\improper PBT \"Pacifier\" mounted taser" icon_state = "mecha_taser" energy_drain = 20 equip_cooldown = 8 @@ -126,7 +126,7 @@ /* Commenting this out rather than removing it because it may be useful for reference. /obj/item/mecha_parts/mecha_equipment/weapon/honker - name = "HoNkER BlAsT 5000" + name = "\improper HoNkER BlAsT 5000" icon_state = "mecha_honker" energy_drain = 200 equip_cooldown = 150 @@ -164,17 +164,6 @@ M.Paralyse(4) else M.make_jittery(500) - /* //else the mousetraps are useless - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(isobj(H.shoes)) - var/thingy = H.shoes - H.drop_from_inventory(H.shoes) - walk_away(thingy,chassis,15,2) - spawn(20) - if(thingy) - walk(thingy,0) - */ chassis.use_power(energy_drain) log_message("Honked from [src.name]. HONK!") do_after_cooldown() @@ -182,7 +171,7 @@ */ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic - name = "General Ballisic Weapon" + name = "general ballisic weapon" var/projectile_energy_cost get_equip_info() @@ -207,7 +196,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - name = "LBX AC 10 \"Scattershot\"" + name = "\improper LBX AC 10 \"Scattershot\"" icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/midbullet @@ -219,7 +208,7 @@ projectile_energy_cost = 25 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg - name = "Ultra AC 2" + name = "\improper Ultra AC 2" icon_state = "mecha_uac2" equip_cooldown = 10 projectile = /obj/item/projectile/bullet/weakbullet @@ -238,7 +227,7 @@ AM.throw_at(target,missile_range, missile_speed, chassis) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive - name = "SRM-8 Missile Rack" + name = "\improper SRM-8 missile rack" icon_state = "mecha_missilerack" projectile = /obj/item/missile fire_sound = 'sound/effects/bang.ogg' @@ -266,7 +255,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang - name = "SGL-6 Grenade Launcher" + name = "\improper SGL-6 grenade launcher" icon_state = "mecha_grenadelnchr" projectile = /obj/item/weapon/grenade/flashbang fire_sound = 'sound/effects/bang.ogg' @@ -283,7 +272,7 @@ F.prime() /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve - name = "SOP-6 Grenade Launcher" + name = "\improper SOP-6 grenade launcher" projectile = /obj/item/weapon/grenade/flashbang/clusterbang construction_cost = list("metal"=20000,"gold"=6000,"uranium"=6000)