diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index af589879..b4fffb21 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -68,13 +68,24 @@ /datum/supply_pack/organic/rawcotton name = "Raw Cotton Crate" desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets." - cost = 800 // 100 net cost, 20 x 20 = 400. 300 proffit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 + cost = 800 // 100 net cost, 20 x 20 = 400. 300 profit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 contains = list(/obj/item/stack/sheet/cotton/thirty, /obj/item/stack/sheet/cotton/ten ) crate_name = "cotton crate" crate_type = /obj/structure/closet/crate/hydroponics +/datum/supply_pack/organic/rawcotton/bulk + name = "Bulk Raw Cotton Crate" + desc = "Plushies are more down in the market than ever before; bulk cotton now for use! Contains 100 raw cotton sheets." + cost = 1700 //Same math as before, but since it's bulk, you get a 100 credit discount to encourage bulk buys. Welcome to space Costco. + contains = list(/obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/ten + ) + + /datum/supply_pack/organic/rawlumber name = "Raw Lumber Crate" desc = "Raw logs from towercaps. Contains fifty logs." diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index e8cda7e1..ceacd0cd 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -37,7 +37,7 @@ contains = list(/obj/item/pen/fountain/captain) crate_name = "captain pen" crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen - + /datum/supply_pack/misc/dueling_stam name = "Dueling Pistols" desc = "Resolve all your quarrels with some nonlethal fun." @@ -301,7 +301,7 @@ /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." - cost = 4000 // it costs so much because the Space Church is ran by Space Jews + cost = 4000 contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/book/bible/booze, @@ -379,3 +379,41 @@ /obj/item/storage/fancy/ringbox/silver ) crate_name = "jewelry crate" + +/datum/supply_pack/misc/carpet_exotic + name = "Exotic Carpet Crate" + desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." + cost = 7000 + contains = list(/obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty) + crate_name = "exotic carpet crate" + +/datum/supply_pack/misc/prospacillin //size changing should be hard to achieve; so enjoy the price tag. + name = "Prospacillin Bottle" + desc = "An extremely expensive solution of growth serum known as Prospacillin. Effects are permanent upon consumption, and growth is slow." + cost = 100000 + contains = list(/obj/item/reagent_containers/food/drinks/prospacillin) + +/datum/supply_pack/misc/diminicillin //size changing should be hard to achieve; so enjoy the price tag. + name = "Diminicillin Bottle" + desc = "An extremely expensive solution of shrinking serum known as Diminicillin. Effects are permanent upon consumption, and shrinking is slow." + cost = 100000 + contains = list(/obj/item/reagent_containers/food/drinks/diminicillin) diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 05328a3e..751b5827 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -47,32 +47,6 @@ /obj/item/stack/packageWrap) crate_name = "cargo supplies crate" -/datum/supply_pack/service/carpet_exotic - name = "Exotic Carpet Crate" - desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." - cost = 7000 - contains = list(/obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "exotic carpet crate" - /datum/supply_pack/service/food_cart name = "Food Cart Crate" desc = "Want to sell food on the go? Cook lost their cart? Well we just so happen to have a few carts to spare!" diff --git a/hyperstation/code/obj/sizeitems.dm b/hyperstation/code/obj/sizeitems.dm new file mode 100644 index 00000000..075b39ab --- /dev/null +++ b/hyperstation/code/obj/sizeitems.dm @@ -0,0 +1,14 @@ +/obj/item/reagent_containers/food/drinks/prospacillin + name = "Prospacillin Bottle" + desc = "An incredibly expensive bottle used by Kinaris command. It has golden engravings and reeks of corporate greed." + w_class = WEIGHT_CLASS_TINY + icon_state = "prospacillin" + list_reagents = list(/datum/reagent/growthchem = 15) + +/obj/item/reagent_containers/food/drinks/diminicillin + name = "Diminicillin Bottle" + desc = "An incredibly expensive bottle used by Kinaris command. It has golden engravings and reeks of corporate greed." + w_class = WEIGHT_CLASS_TINY + icon_state = "diminicillin" + list_reagents = list(/datum/reagent/shrinkchem = 15) + diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index aba6a9b3..36bbef1c 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/tgstation.dme b/tgstation.dme index c83d8436..786d2983 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3061,6 +3061,7 @@ #include "hyperstation\code\obj\pregnancytester.dm" #include "hyperstation\code\obj\rewards.dm" #include "hyperstation\code\obj\rope.dm" +#include "hyperstation\code\obj\sizeitems.dm" #include "hyperstation\code\obj\sounding.dm" #include "interface\interface.dm" #include "interface\menu.dm"