Merge pull request #3004 from Zuhayr/master

Psychic villain gear.

baystation12.dme

@@ -53,9 +53,6 @@
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/voice/Serithi"
 #define FILE_DIR "sound/weapons"
-#define FILE_DIR "tools"
-#define FILE_DIR "tools/AddToChangelog"
-#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
 #define DEBUG
@@ -1109,6 +1106,7 @@
 #include "code\modules\projectiles\projectile\bullets.dm"
 #include "code\modules\projectiles\projectile\change.dm"
 #include "code\modules\projectiles\projectile\energy.dm"
+#include "code\modules\projectiles\projectile\force.dm"
 #include "code\modules\projectiles\projectile\special.dm"
 #include "code\modules\reagents\Chemistry-Colours.dm"
 #include "code\modules\reagents\Chemistry-Holder.dm"

code/modules/clothing/suits/wiz_robe.dm

@@ -29,6 +29,11 @@
 	item_state = "magus"
 	siemens_coefficient = 0.8
 
+/obj/item/clothing/head/wizard/amp
+	name = "psychic amplifier"
+	desc = "A crown-of-thorns psychic amplifier. Kind of looks like a tiara having sex with an industrial robot."
+	icon_state = "amp"
+	siemens_coefficient = 0.8
 
 /obj/item/clothing/suit/wizrobe
 	name = "wizard robe"
@@ -68,6 +73,11 @@
 	icon_state = "magusred"
 	item_state = "magusred"
 
+/obj/item/clothing/suit/wizrobe/psypurple
+	name = "purple robes"
+	desc = "Heavy, royal purple robes threaded with psychic amplifiers and weird, bulbous lenses. Do not machine wash."
+	icon_state = "psyamp"
+	item_state = "psyamp"
 
 /obj/item/clothing/suit/wizrobe/fake
 	name = "wizard robe"

code/modules/clothing/under/miscellaneous.dm

@@ -131,6 +131,13 @@
 	icon_state = "cloud"
 	color = "cloud"
 
+/obj/item/clothing/under/psysuit
+	name = "dark undersuit"
+	desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
+	icon_state = "psysuit"
+	item_state = "psysuit"
+	color = "psysuit"
+
 /obj/item/clothing/under/gimmick/rank/captain/suit
 	name = "captain's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."

code/modules/projectiles/guns/energy/special.dm

@@ -166,3 +166,22 @@ obj/item/weapon/gun/energy/staff
 	icon_state = "xray"
 	projectile_type = "/obj/item/projectile/beam/mindflayer"
 	fire_sound = 'sound/weapons/Laser.ogg'
+
+obj/item/weapon/gun/energy/staff/focus
+	name = "mental focus"
+	desc = "An artefact that channels the will of the user into destructive bolts of force. If you aren't careful with it, you might poke someone's brain out."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "focus"
+	item_state = "focus"
+	projectile_type = "/obj/item/projectile/forcebolt"
+	/*
+	attack_self(mob/living/user as mob)
+		if(projectile_type == "/obj/item/projectile/forcebolt")
+			charge_cost = 200
+			user << "\red The [src.name] will now strike a small area."
+			projectile_type = "/obj/item/projectile/forcebolt/strong"
+		else
+			charge_cost = 100
+			user << "\red The [src.name] will now strike only a single person."
+			projectile_type = "/obj/item/projectile/forcebolt"
+	*/

code/modules/projectiles/projectile/force.dm

@@ -0,0 +1,29 @@
+/obj/item/projectile/forcebolt
+	name = "force bolt"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "ice_1"
+	damage = 20
+	flag = "energy"
+
+/obj/item/projectile/forcebolt/strong
+	name = "force bolt"
+
+/obj/item/projectile/forcebolt/on_hit(var/atom/target, var/blocked = 0)
+
+	var/obj/T = target
+	var/throwdir = get_dir(firer,target)
+	T.throw_at(get_edge_target_turf(target, throwdir),10,1)
+	return 1
+
+/*
+/obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0)
+
+	// NONE OF THIS WORKS. DO NOT USE.
+	var/throwdir = null
+
+	for(var/mob/M in hearers(2, src))
+		if(M.loc != src.loc)
+			throwdir = get_dir(src,target)
+			M.throw_at(get_edge_target_turf(M, throwdir),15,1)
+	return ..()
+*/