From 5bc9ea47e42e6caf6dda3363d15eaa97a2e146db Mon Sep 17 00:00:00 2001 From: Jarcolr Date: Sun, 4 May 2014 00:40:08 +0300 Subject: [PATCH] Added storage/misc for objs that don't fit in Also moved the dicepack there. --- baystation12.dme | 1 + code/game/objects/items/weapons/storage/firstaid.dm | 10 ---------- code/game/objects/items/weapons/storage/misc.dm | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 code/game/objects/items/weapons/storage/misc.dm diff --git a/baystation12.dme b/baystation12.dme index 6aff3b7d65..53a88423eb 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -563,6 +563,7 @@ #include "code\game\objects\items\weapons\storage\firstaid.dm" #include "code\game\objects\items\weapons\storage\internal.dm" #include "code\game\objects\items\weapons\storage\lockbox.dm" +#include "code\game\objects\items\weapons\storage\misc.dm" #include "code\game\objects\items\weapons\storage\secure.dm" #include "code\game\objects\items\weapons\storage\storage.dm" #include "code\game\objects\items\weapons\storage\toolbox.dm" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index b0e8f6eb2f..48a6462651 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -2,7 +2,6 @@ * Contains: * First Aid Kits * Pill Bottles - * Dice Pack (in a pill bottle) */ /* @@ -182,12 +181,3 @@ new /obj/item/weapon/reagent_containers/pill/tramadol( src ) new /obj/item/weapon/reagent_containers/pill/tramadol( src ) -/obj/item/weapon/storage/pill_bottle/dice - name = "pack of dice" - desc = "It's a small container with dice inside." - - New() - ..() - new /obj/item/weapon/dice( src ) - new /obj/item/weapon/dice/d20( src ) - diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm new file mode 100644 index 0000000000..1e798304bd --- /dev/null +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -0,0 +1,9 @@ + +/obj/item/weapon/storage/pill_bottle/dice + name = "pack of dice" + desc = "It's a small container with dice inside." + + New() + ..() + new /obj/item/weapon/dice( src ) + new /obj/item/weapon/dice/d20( src )