Description Consolidation (#9038)

I moved the desc_info to their parent thingies, because alt clicking the type and being sent to the description.dm was infuriating.
This commit is contained in:
Geeves
2020-06-10 09:03:44 +03:00
committed by GitHub
parent ced8c44d51
commit 1f213e48c0
62 changed files with 318 additions and 523 deletions
+3 -1
View File
@@ -17,10 +17,12 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
/obj/item/stack/rods
name = "metal rod"
desc = "Some rods. Can be used for building, or something."
desc_info = "Made from metal sheets. You can build a grille by using it in your hand. \
Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets."
singular_name = "metal rod"
icon_state = "rods"
flags = CONDUCT
w_class = 3.0
w_class = ITEMSIZE_NORMAL
force = 9.0
throwforce = 15.0
throw_speed = 5
@@ -14,6 +14,7 @@
/obj/item/stack/material/glass
name = "glass"
singular_name = "glass sheet"
desc_info = "Use in your hand to build a window. Can be upgraded to reinforced glass by adding metal rods, which are made from metal sheets."
icon_state = "sheet-glass"
var/created_window = /obj/structure/window/basic
var/is_reinforced = 0
@@ -102,6 +103,7 @@
*/
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
desc_info = "Use in your hand to build a window. Reinforced glass is much stronger against damage."
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
default_type = "reinforced glass"
@@ -211,6 +211,9 @@
color
name = "energy sword"
desc = "May the force be within you."
desc_antag = "The energy sword is a very strong melee weapon, capable of severing limbs easily, if they are targeted. It can also has a chance \
to block projectiles and melee attacks while it is on and being held. The sword can be toggled on or off by using it in your hand. While it is off, \
it can be concealed in your pocket or bag."
icon_state = "sword0"
active_force = 30
active_throwforce = 20
@@ -2,6 +2,9 @@
/obj/item/melee/baton
name = "stunbaton"
desc = "A stun baton for incapacitating people with."
desc_info = "The baton needs to be turned on to apply the stunning effect. Use it in your hand to toggle it on or off. If your intent is \
set to 'harm', you will inflict damage when using it, regardless if it is on or not. Each stun reduces the baton's charge, which can be replenished by \
putting it inside a weapon recharger."
icon_state = "stunbaton"
item_state = "baton"
slot_flags = SLOT_BELT