Fix remaining wand of nothing locations (#49254)

Finishes #49240 which wasn't quite done.
This commit is contained in:
itseasytosee
2020-02-16 11:46:57 -08:00
committed by GitHub
parent b82a2d916f
commit 77e8fbcd32
4 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -3139,7 +3139,7 @@
/area/awaymission/academy/academyengine)
"mn" = (
/obj/structure/rack,
/obj/item/gun/magic/wand,
/obj/item/gun/magic/wand/nothing,
/turf/open/floor/plating,
/area/awaymission/academy/academyengine)
"mo" = (
@@ -18035,8 +18035,8 @@
},
/area/medical/genetics)
"aYg" = (
/mob/living/carbon/monkey,
/obj/effect/landmark/start/geneticist,
/mob/living/carbon/monkey,
/turf/open/floor/plasteel,
/area/medical/genetics)
"aYh" = (
@@ -38797,7 +38797,7 @@
dir = 8
},
/obj/item/toy/figure/mime,
/obj/item/gun/magic/wand,
/obj/item/gun/magic/wand/nothing,
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"cad" = (
+4 -1
View File
@@ -1,6 +1,6 @@
/obj/item/gun/magic/wand
name = "wand of nothing"
desc = "It's not just a stick, it's a MAGIC stick!"
desc = "It's not just a stick, it's a MAGIC stick! You shouldn't have this."
ammo_type = /obj/item/ammo_casing/magic
icon_state = "nothingwand"
item_state = "wand"
@@ -233,4 +233,7 @@
/////////////////////////////////////
/obj/item/gun/magic/wand/nothing
desc = "It's not just a stick, it's a MAGIC stick?"
ammo_type = /obj/item/ammo_casing/magic/nothing
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/item/gohei = 1)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/gun/magic/wand = 2,
/obj/item/gun/magic/wand/nothing = 2,
/obj/item/clothing/glasses/sunglasses/garb = 2,
/obj/item/clothing/glasses/blindfold = 1,
/obj/item/clothing/mask/muzzle = 2)