Clown Toy Box + Wooden Crates

This commit is contained in:
CitadelStationBot
2017-06-09 11:02:37 -05:00
parent 7fa05ca854
commit f26cf4e9ef
13 changed files with 73 additions and 24 deletions

View File

@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = 1, on_floor = 1),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = 1, on_floor = 1),\
new/datum/stack_recipe("baseball bat", /obj/item/weapon/melee/baseball_bat, 5, time = 15),\
))

View File

@@ -0,0 +1,18 @@
/obj/structure/closet/crate/wooden
name = "wooden crate"
desc = "Works just as well as a metal one."
material_drop = /obj/item/stack/sheet/mineral/wood
material_drop_amount = 6
icon_state = "wooden"
/obj/structure/closet/crate/wooden/toy
name = "toy box"
desc = "It has the words \"Clown + Mime\" written underneath of it with marker."
/obj/structure/closet/crate/wooden/toy/PopulateContents()
. = ..()
new /obj/item/device/megaphone/clown(src)
new /obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
new /obj/item/weapon/pneumatic_cannon/pie(src)
new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src)
new /obj/item/weapon/storage/crayons(src)

View File

@@ -14,7 +14,7 @@
/datum/export/large/crate/wooden
cost = 100
unit_name = "wooden crate"
unit_name = "large wooden crate"
export_types = list(/obj/structure/closet/crate/large)
exclude_types = list()
@@ -22,6 +22,13 @@
unit_name = "ore box"
export_types = list(/obj/structure/ore_box)
/datum/export/large/crate/wood
cost = 240
unit_name = "wooden crate"
export_types = list(/obj/structure/closet/crate/wooden)
exclude_types = list()
// Reagent dispensers.
/datum/export/large/reagent_dispenser

View File

@@ -0,0 +1,10 @@
diff a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm (rejected hunks)
@@ -6,7 +6,7 @@
k_elasticity = 0
unit_name = "crate"
export_types = list(/obj/structure/closet/crate)
- exclude_types = list(/obj/structure/closet/crate/large)
+ exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)
/datum/export/large/crate/total_printout() // That's why a goddamn metal crate costs that much.
. = ..()

View File

@@ -34,9 +34,6 @@ Clown
/obj/item/weapon/stamp/clown = 1,
/obj/item/weapon/reagent_containers/spray/waterflower = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/device/megaphone/clown = 1,
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/canned_laughter = 1,
/obj/item/weapon/pneumatic_cannon/pie = 1
)
implants = list(/obj/item/weapon/implant/sad_trombone)