From 7bfc68afa60cd53d378cb52bcf7cf58aad5730b4 Mon Sep 17 00:00:00 2001
From: Dsdiy <40638666+Dsdiy@users.noreply.github.com>
Date: Sun, 21 Feb 2021 21:30:28 +0000
Subject: [PATCH] Updating Clown Ruin and nerfing Staff of slipping. (#15362)

* Updating Clown Ruin and nerfing Staff of slipping.

I noticed how the staff of slipping was commonly used by antags as an infinite stun that also affected borgs. So, I replaced the one that spawns on lavaland with one that only has 5 charges.

* Updates as requested

Changed to wand of slipping to avoid confusion with staff

* Old nerfed Staff removal

Quickly removes old nerfed staff

* fixes errors

should compile in DM now

* requested changes

Changes as requested by Arc
---
 .../LavaRuins/lavaland_biodome_clown_planet.dmm  |  2 +-
 code/modules/projectiles/guns/magic/staff.dm     |  2 +-
 code/modules/projectiles/guns/magic/wand.dm      | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index be40fb0f2ab..6bf8bd85d37 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -961,7 +961,7 @@
 /area/ruin/powered/clownplanet)
 "by" = (
 /obj/structure/table/glass,
-/obj/item/gun/magic/staff/slipping,
+/obj/item/gun/magic/wand/slipping,
 /turf/simulated/floor/carpet,
 /area/ruin/powered/clownplanet)
 "bB" = (
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index ec854602ab9..06e522733e2 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -53,7 +53,7 @@
 	fire_sound = 'sound/magic/staff_door.ogg'
 
 /obj/item/gun/magic/staff/slipping
-	name = "staff of slipping"
+	name = "wand of slipping"
 	desc = "An artefact that spits... bananas?"
 	ammo_type = /obj/item/ammo_casing/magic/slipping
 	icon_state = "staffofslipping"
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 5823e69b39a..e69eec1831f 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -163,3 +163,19 @@
 	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
 	charges--
 	..()
+
+/////////////////////////////////////
+//WAND OF SLIPPING
+/////////////////////////////////////
+/obj/item/gun/magic/wand/slipping
+	name = "wand of slipping"
+	desc = "This wand shoots... banana peels?"
+	fire_sound = 'sound/items/bikehorn.ogg'
+	ammo_type = /obj/item/ammo_casing/magic/slipping
+	icon_state = "staffofslipping"
+	max_charges = 5 //5, 4, 3, 2
+
+/obj/item/gun/magic/wand/slipping/zap_self(mob/living/user)
+	to_chat(user, "<span class='notice'>You feel rather silly!.</span>")
+	charges--
+	..()