From c53d14d80cfc64458f35c1396fae7c35e3ca993a Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 05:28:41 +0100 Subject: [PATCH] Weapon type design datums will now get proper description. Also fixes two names I forgot to fix before. --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/modules/research/designs.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index fa4bc3858ce..bcb907a0409 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -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 diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index ea44763bb91..0210b9b79b1 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -753,6 +753,7 @@ datum/design/item/stock_part build_type = PROTOLATHE datum/design/item/stock_part/AssembleDesignName() + ..() name = "Component design ([item_name])" datum/design/item/stock_part/AssembleDesignDesc() @@ -1017,7 +1018,7 @@ datum/design/circuit/smes_cell ///////////////Power Items////////////// //////////////////////////////////////// datum/design/item/light_replacer - name = "Light Replacer" + name = "Light replacer" desc = "A device to automatically replace lights. Refill with working lightbulbs." id = "light_replacer" req_tech = list("magnets" = 3, "materials" = 4) @@ -1246,7 +1247,7 @@ datum/design/item/weapon/AssembleDesignDesc() if(!desc) if(build_path) var/obj/item/I = build_path - desc = I.desc + desc = initial(I.desc) ..() datum/design/item/weapon/nuclear_gun