Merge pull request #8379 from Neerti/3-6-2015_help_text_weapons

Examine Tab Text: (Some) Weapons

baystation12.dme

@@ -968,6 +968,7 @@
 #include "code\modules\examine\descriptions\stacks.dm"
 #include "code\modules\examine\descriptions\structures.dm"
 #include "code\modules\examine\descriptions\turfs.dm"
+#include "code\modules\examine\descriptions\weapons.dm"
 #include "code\modules\ext_scripts\irc.dm"
 #include "code\modules\ext_scripts\python.dm"
 #include "code\modules\flufftext\Dreaming.dm"

code/modules/clothing/under/chameleon.dm

@@ -12,7 +12,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/under/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/under/chameleon, /obj/item/clothing/under/cloud, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
 	for(var/U in typesof(/obj/item/clothing/under)-blocked)
@@ -20,7 +20,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity)
+/obj/item/clothing/under/chameleon/emp_act(severity)
 	name = "psychedelic"
 	desc = "Groovy!"
 	icon_state = "psyche"
@@ -28,7 +28,7 @@
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/under/chameleon/verb/change()
 	set name = "Change Jumpsuit Appearance"
 	set category = "Object"
 	set src in usr
@@ -64,7 +64,7 @@
 	body_parts_covered = 0
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/head/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/head/chameleon,/obj/item/clothing/head/justice,)//Prevent infinite loops and bad hats.
 	for(var/U in typesof(/obj/item/clothing/head)-blocked)
@@ -72,7 +72,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/head/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "grey cap"
 	desc = "It's a baseball hat in a tasteful grey colour."
 	icon_state = "greysoft"
@@ -80,7 +80,7 @@
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/head/chameleon/verb/change()
 	set name = "Change Hat/Helmet Appearance"
 	set category = "Object"
 	set src in usr
@@ -115,7 +115,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/suit/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/suit/chameleon, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice,
 		/obj/item/clothing/suit/greatcoat)//Prevent infinite loops and bad suits.
@@ -124,7 +124,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/suit/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "armor"
 	desc = "An armored vest that protects against some damage."
 	icon_state = "armor"
@@ -132,7 +132,7 @@
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/suit/chameleon/verb/change()
 	set name = "Change Exosuit Appearance"
 	set category = "Object"
 	set src in usr
@@ -167,7 +167,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/shoes/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/shoes/chameleon, /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/shoes/cyborg)//prevent infinite loops and bad shoes.
 	for(var/U in typesof(/obj/item/clothing/shoes)-blocked)
@@ -175,7 +175,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/shoes/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "black shoes"
 	desc = "A pair of black shoes."
 	icon_state = "black"
@@ -184,7 +184,7 @@
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/shoes/chameleon/verb/change()
 	set name = "Change Footwear Appearance"
 	set category = "Object"
 	set src in usr
@@ -216,7 +216,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/weapon/storage/backpack/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/weapon/storage/backpack/chameleon, /obj/item/weapon/storage/backpack/satchel/withwallet)
 	for(var/U in typesof(/obj/item/weapon/storage/backpack)-blocked)//Prevent infinite loops and bad backpacks.
@@ -224,7 +224,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/weapon/storage/backpack/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."
 	icon_state = "backpack"
@@ -234,7 +234,7 @@
 		var/mob/M = src.loc
 		M.update_inv_back()
 
-	verb/change()
+/obj/item/weapon/storage/backpack/chameleon/verb/change()
 	set name = "Change Backpack Appearance"
 	set category = "Object"
 	set src in usr
@@ -272,7 +272,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/gloves/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/gloves/chameleon)//Prevent infinite loops and bad hats.
 	for(var/U in typesof(/obj/item/clothing/gloves)-blocked)
@@ -280,7 +280,7 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/gloves/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "black gloves"
 	desc = "It looks like a pair of gloves, but it seems to have a small dial inside."
 	icon_state = "black"
@@ -288,7 +288,7 @@
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/gloves/chameleon/verb/change()
 	set name = "Change Gloves Appearance"
 	set category = "Object"
 	set src in usr
@@ -322,7 +322,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/mask/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/mask/chameleon)//Prevent infinite loops and bad hats.
 	for(var/U in typesof(/obj/item/clothing/mask)-blocked)
@@ -331,14 +331,14 @@
 			src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/mask/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "gas mask"
 	desc = "It's a gas mask."
 	icon_state = "gas_alt"
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/mask/chameleon/verb/change()
 	set name = "Change Mask Appearance"
 	set category = "Object"
 	set src in usr
@@ -372,7 +372,7 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
-	New()
+/obj/item/clothing/glasses/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/clothing/glasses/chameleon)//Prevent infinite loops and bad hats.
 	for(var/U in typesof(/obj/item/clothing/glasses)-blocked)
@@ -380,14 +380,14 @@
 		src.clothing_choices[V.name] = U
 	return
 
-	emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
+/obj/item/clothing/glasses/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP.  In this case your cover's blown.
 	name = "Optical Meson Scanner"
 	desc = "It's a set of mesons."
 	icon_state = "meson"
 	update_icon()
 	update_clothing_icon()
 
-	verb/change()
+/obj/item/clothing/glasses/chameleon/verb/change()
 	set name = "Change Glasses Appearance"
 	set category = "Object"
 	set src in usr
@@ -423,7 +423,7 @@
 	matter = list()
 	var/list/gun_choices = list()
 
-	New()
+/obj/item/weapon/gun/projectile/chameleon/New()
 	..()
 	var/blocked = list(/obj/item/weapon/gun/projectile/chameleon)
 	for(var/U in typesof(/obj/item/weapon/gun/)-blocked)
@@ -431,7 +431,7 @@
 		src.gun_choices[V.name] = U
 	return
 
-	emp_act(severity)
+/obj/item/weapon/gun/projectile/chameleon/emp_act(severity)
 	name = "desert eagle"
 	desc = "It's a desert eagle."
 	icon_state = "deagle"
@@ -441,12 +441,11 @@
 		M.update_inv_r_hand()
 		M.update_inv_l_hand()
 
-	verb/change()
+/obj/item/weapon/gun/projectile/chameleon/verb/change(picked in gun_choices)
 	set name = "Change Gun Appearance"
 	set category = "Object"
 	set src in usr
 
-		var/picked = input("Select gun to change it to", "Chameleon Gun")as null|anything in gun_choices
 	if(!picked || !gun_choices[picked])
 		return
 	var/newtype = gun_choices[picked]

code/modules/examine/descriptions/weapons.dm

@@ -0,0 +1,91 @@
+/*
+	Note: This file is meant for actual weapons (guns, swords, etc), and not the stupid 'every obj is a weapon, except when it's not' thing.
+*/
+
+//******
+//*Guns*
+//******
+
+//This contains a lot of copypasta but I'm told it's better then a lot of New()s appending the var.
+/obj/item/weapon/gun
+	description_info = "This is a gun.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire."
+
+/obj/item/weapon/gun/energy
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger."
+
+/obj/item/weapon/gun/energy/crossbow
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire."
+	description_antag = "This is a stealthy weapon which fires poisoned bolts at your target.  When it hits someone, they will suffer a stun effect, in \
+	addition to toxins.  The energy crossbow recharges itself slowly, and can be concealed in your pocket or bag."
+
+/obj/item/weapon/gun/energy/gun
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
+	in your hand.  To recharge this weapon, use a weapon recharger."
+
+/obj/item/weapon/gun/energy/gun/taser
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly. To recharge this weapon, use a weapon recharger."
+
+/obj/item/weapon/gun/energy/gun/stunrevolver
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly. To recharge this weapon, use a weapon recharger."
+
+/obj/item/weapon/gun/energy/gun/nuclear
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
+	in your hand.  Unlike most weapons, this weapon recharges itself."
+
+/obj/item/weapon/gun/energy/captain
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly. Unlike most weapons, this weapon recharges itself."
+
+/obj/item/weapon/gun/energy/sniperrifle
+	description_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger. \
+	To use the scope, use the appropriate verb in the object tab."
+
+/obj/item/weapon/gun/projectile
+	description_info = "This is a ballistic weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  To reload, click the weapon in your hand to unload (if needed), then add the appropiate ammo.  The description \
+	will tell you what caliber you need."
+
+/obj/item/weapon/gun/projectile/chameleon
+	description_info = null //The chameleon gun adopts the description_info of the weapon it is impersonating as, to make meta-ing harder.
+	description_antag = "This gun can alter its appearance to mimick other weapons.  To change the appearance, use the appropriate verb in the object tab. \
+	The ammo loaded by default makes the gun useless for actual combat."
+
+/obj/item/weapon/gun/projectile/chameleon/change(picked in gun_choices) //Making the gun change its help text to match the weapon's help text.
+	..(picked)
+	var/obj/O = gun_choices[picked]
+	description_info = initial(O.description_info)
+
+/obj/item/weapon/gun/projectile/shotgun/pump
+	description_info = "This is a ballistic weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  After firing, you will need to pump the gun, by clicking on the gun in your hand.  To reload, load more shotgun \
+	shells into the gun."
+
+/obj/item/weapon/gun/projectile/heavysniper
+	description_info = "This is a ballistic weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
+	then click where you want to fire.  The gun's chamber can be opened or closed by using it in your hand.  To reload, open the chamber, add a new bullet \
+	then close it.  To use the scope, use the appropriate verb in the object tab."
+
+//*******
+//*Melee*
+//*******
+
+/obj/item/weapon/melee/baton
+	description_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."
+
+/obj/item/weapon/melee/energy/sword
+	description_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."
+
+/obj/item/weapon/melee/cultblade
+	description_antag = "This sword is a powerful weapon, capable of severing limbs easily, if they are targeted.  Nonbelivers are unable to use this weapon."