From b4e970eb90c32dd9afab2b89ca142a0d453a00f9 Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Fri, 13 Jan 2023 17:04:11 -0300 Subject: [PATCH] Added pie cannon and spirit board to Sol Trader items (#20100) * Added pie cannon and spirit board to Sol Traders items * Update code/game/objects/structures/spirit_board.dm Co-authored-by: Farie82 Co-authored-by: Farie82 --- code/game/objects/effects/spawners/lootdrop.dm | 2 ++ code/game/objects/structures/spirit_board.dm | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 3c6f0a8b0a7..a9029ca4929 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -340,6 +340,7 @@ lootcount = 1 loot = list( /obj/machinery/disco = 20, + /obj/structure/spirit_board = 20, /obj/mecha/combat/durand/old = 20 ) @@ -377,6 +378,7 @@ // Clown /obj/item/grenade/clusterbuster/honk = 100, /obj/item/bikehorn/golden = 100, + /obj/item/gun/throw/piecannon = 100, // Bartender /obj/item/storage/box/bartender_rare_ingredients_kit = 100, diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index f389fc0086a..b1e061569f9 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -12,7 +12,7 @@ /obj/structure/spirit_board/examine(mob/user) . = ..() - . += "[initial(desc)] The planchette is sitting at \"[planchette]\"." + . += "The planchette is sitting at \"[planchette]\"." /obj/structure/spirit_board/attack_hand(mob/user as mob) if(..()) @@ -78,3 +78,7 @@ return 0 return 1 + +/obj/structure/spirit_board/wrench_act(mob/living/user, obj/item/I) + . = TRUE + default_unfasten_wrench(user, I, time = 4 SECONDS)