From f026083397ca36a0a0125fc51dfc4dadb93ae68a Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 8 Apr 2015 15:03:43 -0700 Subject: [PATCH] Obtainable dice and D&D figures - Adds D&D figure box to library - Adds both full dice set box and D&D figure box to cargo store --- code/game/objects/items/weapons/dice.dm | 16 +++++++++++++++- code/modules/store/items.dm | 12 ++++++++++++ maps/cyberiad.dmm | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 231bf486d77..20c580dbc01 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -86,4 +86,18 @@ *///ew. /obj/item/weapon/dice/update_icon() overlays.Cut() - overlays += "[src.icon_state][src.result]" \ No newline at end of file + overlays += "[src.icon_state][src.result]" +/obj/item/weapon/storage/box/dice + name = "Box of dice" + desc = "ANOTHER ONE!? FUCK!" + icon_state = "box" + +/obj/item/weapon/storage/box/dice/New() + ..() + new /obj/item/weapon/dice/d2(src) + new /obj/item/weapon/dice/d4(src) + new /obj/item/weapon/dice/d8(src) + new /obj/item/weapon/dice/d10(src) + new /obj/item/weapon/dice/d00(src) + new /obj/item/weapon/dice/d12(src) + new /obj/item/weapon/dice/d20(src) diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index 3c97841e2f2..73d7796d327 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -45,6 +45,18 @@ typepath = /obj/item/weapon/storage/box/snappops cost = 200 +/datum/storeitem/d&d + name = "Dungeons & Dragons set" + desc = "A box containing minifigures suitable for a good game of D&D." + typepath = /obj/item/weapon/storage/box/characters + cost = 200 + +/datum/storeitem/dice + name = "Dice set" + desc = "A box containing multiple different types of die." + typepath = /obj/item/weapon/storage/box/dice + cost = 200 + /datum/storeitem/crayons name = "Crayons" desc = "Let security know how they're doing by scrawling lovenotes all over their hallways." diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 1b87ede075a..e44bd76c864 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -1983,7 +1983,7 @@ "aMg" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/security/brig) "aMh" = (/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigFoyer"; name = "Brig Foyer Doors"; normaldoorcontrol = 1; pixel_x = -5; pixel_y = -35; range = 10},/obj/machinery/door_control{desc = "A remote control switch for the brig doors leading to cells 1-4."; id = "BrigEast"; name = "Brig Cells 1-4 Hallway Doors"; normaldoorcontrol = 1; pixel_x = 5; pixel_y = -25; range = 10},/obj/machinery/door_control{desc = "A remote control switch for the brig doors leading to cells 5 and 6."; id = "BrigWest"; name = "Brig Cells 5-6 Hallway Doors"; normaldoorcontrol = 1; pixel_x = -5; pixel_y = -25; range = 20},/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; frequency = 1475; listening = 1; name = "Station Intercom (Security)"; pixel_x = 30; pixel_y = 0},/obj/structure/stool/bed/chair/office/dark{dir = 8},/turf/simulated/floor{dir = 2; icon_state = "redfull"; tag = "icon-redfull (NORTHWEST)"},/area/security/brig) "aMi" = (/obj/machinery/door/airlock/maintenance{name = "Library Maintenance"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aMj" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/table/woodentable,/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/turf/simulated/floor/wood,/area/library) +"aMj" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/table/woodentable,/obj/item/weapon/dice/d20,/obj/item/weapon/dice,/obj/item/weapon/storage/box/characters,/turf/simulated/floor/wood,/area/library) "aMk" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/stack/packageWrap,/turf/simulated/floor/wood,/area/library) "aMl" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/wood,/area/library) "aMm" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)