From bb892c90e4f61928b37a39a700a1e3362b766cd3 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Fri, 15 Jan 2021 22:38:24 -0700 Subject: [PATCH] New Cargo Crates, Moves Some Around Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment. --- code/modules/cargo/packs/materials.dm | 13 +++++++- code/modules/cargo/packs/misc.dm | 42 ++++++++++++++++++++++++-- code/modules/cargo/packs/service.dm | 26 ---------------- hyperstation/code/obj/sizeitems.dm | 14 +++++++++ icons/obj/drinks.dmi | Bin 100751 -> 101900 bytes tgstation.dme | 1 + 6 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 hyperstation/code/obj/sizeitems.dm 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 aba6a9b362984f131001436b0898e2b4cffb9847..36bbef1c1ed41983253844fac5429da003b6a603 100644 GIT binary patch delta 4469 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 delta 3311 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 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"