cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Weapon type design datums will now get proper description.

Browse Source 
Also fixes two names I forgot to fix before.
This commit is contained in:
Amunak
2014-12-18 05:28:41 +01:00
parent 16c548b03f
commit c53d14d80c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -71,7 +71,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
equip_cooldown = 30 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." desc = "While not regulation, this inefficient weapon can be attached to working exo-suits in desperate, or malicious, times."
icon_state = "mecha_laser" icon_state = "mecha_laser"
energy_drain = 80 energy_drain = 80

5
code/modules/research/designs.dm
View File

@@ -753,6 +753,7 @@ datum/design/item/stock_part
build_type = PROTOLATHE build_type = PROTOLATHE
datum/design/item/stock_part/AssembleDesignName() datum/design/item/stock_part/AssembleDesignName()
..()
name = "Component design ([item_name])" name = "Component design ([item_name])"
datum/design/item/stock_part/AssembleDesignDesc() datum/design/item/stock_part/AssembleDesignDesc()
@@ -1017,7 +1018,7 @@ datum/design/circuit/smes_cell
///////////////Power Items////////////// ///////////////Power Items//////////////
//////////////////////////////////////// ////////////////////////////////////////
datum/design/item/light_replacer datum/design/item/light_replacer
name = "Light Replacer" name = "Light replacer"
desc = "A device to automatically replace lights. Refill with working lightbulbs." desc = "A device to automatically replace lights. Refill with working lightbulbs."
id = "light_replacer" id = "light_replacer"
req_tech = list("magnets" = 3, "materials" = 4) req_tech = list("magnets" = 3, "materials" = 4)
@@ -1246,7 +1247,7 @@ datum/design/item/weapon/AssembleDesignDesc()
if(!desc) if(!desc)
if(build_path) if(build_path)
var/obj/item/I = build_path var/obj/item/I = build_path
desc = I.desc desc = initial(I.desc)
..() ..()
datum/design/item/weapon/nuclear_gun datum/design/item/weapon/nuclear_gun