Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Imaginos16
Imaginos16 committed Oct 9, 2024
2 parents a4db861 + 030dc0e commit f4450a3
Show file tree
Hide file tree
Showing 19 changed files with 245 additions and 174 deletions.
12 changes: 6 additions & 6 deletions code/__DEFINES/storage.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
// PLEASE KEEP ALL VOLUME DEFINES IN THIS FILE, it's going to be hell to keep track of them later.
#define DEFAULT_VOLUME_TINY 1
#define DEFAULT_VOLUME_SMALL 2
#define DEFAULT_VOLUME_NORMAL 6
#define DEFAULT_VOLUME_BULKY 12
#define DEFAULT_VOLUME_HUGE 24
#define DEFAULT_VOLUME_NORMAL 8
#define DEFAULT_VOLUME_BULKY 14
#define DEFAULT_VOLUME_HUGE 28
#define DEFAULT_VOLUME_GIGANTIC 48

GLOBAL_LIST_INIT(default_weight_class_to_volume, list(
Expand Down Expand Up @@ -80,9 +80,9 @@ GLOBAL_LIST_INIT(default_weight_class_to_volume, list(
#define MAX_WEIGHT_CLASS_DUFFEL WEIGHT_CLASS_BULKY

// max_volume for storages
#define STORAGE_VOLUME_CONTAINER_S DEFAULT_VOLUME_NORMAL //3 small items
#define STORAGE_VOLUME_CONTAINER_M (DEFAULT_VOLUME_NORMAL * 2) //6 small items
#define STORAGE_VOLUME_CONTAINER_S DEFAULT_VOLUME_NORMAL //4 small items
#define STORAGE_VOLUME_CONTAINER_M (DEFAULT_VOLUME_NORMAL * 2) //8 small items
#define STORAGE_VOLUME_SATCHEL (DEFAULT_VOLUME_NORMAL * 4) //4 normal items
#define STORAGE_VOLUME_BACKPACK (DEFAULT_VOLUME_NORMAL * 6) //6 normal items, or 3 bulky items
#define STORAGE_VOLUME_BACKPACK (DEFAULT_VOLUME_NORMAL * 6) //1.5x satchel, 3 bulky items
#define STORAGE_VOLUME_DUFFLEBAG (DEFAULT_VOLUME_NORMAL * 8) // 2 huge items, or 4 bulky items
#define STORAGE_VOLUME_BAG_OF_HOLDING (DEFAULT_VOLUME_NORMAL * 9) //1.5X backpack
38 changes: 6 additions & 32 deletions code/game/objects/items/storage/boxes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
/obj/item/storage/box/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
STR.max_volume = STORAGE_VOLUME_CONTAINER_S
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.use_sound = 'sound/items/storage/briefcase.ogg'

/obj/item/storage/box/update_overlays()
Expand Down Expand Up @@ -477,11 +480,6 @@
for(var/i in 1 to 6)
new donktype(src)

/obj/item/storage/box/donkpockets/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/donkpocket))

/obj/item/storage/box/donkpockets/donkpocketspicy
name = "box of spicy-flavoured donk-pockets"
icon_state = "donkpocketboxspicy"
Expand Down Expand Up @@ -519,12 +517,6 @@
illustration = null
var/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube

/obj/item/storage/box/monkeycubes/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))

/obj/item/storage/box/monkeycubes/PopulateContents()
for(var/i in 1 to 5)
new cube_type(src)
Expand All @@ -539,12 +531,6 @@
icon_state = "monkeycubebox"
illustration = null

/obj/item/storage/box/gorillacubes/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 3
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))

/obj/item/storage/box/gorillacubes/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/monkeycube/gorilla(src)
Expand Down Expand Up @@ -676,12 +662,6 @@
icon = 'icons/obj/toy.dmi'
icon_state = "spbox"

/obj/item/storage/box/snappops/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.set_holdable(list(/obj/item/toy/snappop))
STR.max_items = 8

/obj/item/storage/box/snappops/PopulateContents()
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/toy/snappop)

Expand All @@ -697,12 +677,6 @@
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
custom_price = 20

/obj/item/storage/box/matches/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 10
STR.set_holdable(list(/obj/item/match))

/obj/item/storage/box/matches/PopulateContents()
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/match)

Expand All @@ -720,9 +694,10 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap

/obj/item/storage/box/lights/ComponentInitialize()
/obj/item/storage/box/lights/ComponentInitialize()//holy oversized box. this one can stay the way it is, for now
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
STR.max_items = 21
STR.set_holdable(list(/obj/item/light/tube, /obj/item/light/bulb))
STR.max_combined_w_class = 21
Expand Down Expand Up @@ -1479,8 +1454,7 @@
/obj/item/storage/box/gum/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/chewable/bubblegum))
STR.max_items = 4
STR.max_volume = (STORAGE_VOLUME_CONTAINER_S / 2)

/obj/item/storage/box/gum/PopulateContents()
for(var/i in 1 to 4)
Expand Down
152 changes: 97 additions & 55 deletions code/modules/cargo/packs/chemistry.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,26 @@
name = "Chemical Starter Kit Crate"
desc = "Contains thirteen different chemicals, for all the fun experiments you can make."
cost = 1250 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised.
contains = list(/obj/item/reagent_containers/glass/bottle/hydrogen,
contains = list(/obj/item/reagent_containers/glass/bottle/aluminium,
/obj/item/reagent_containers/glass/bottle/bromine,
/obj/item/reagent_containers/glass/bottle/carbon,
/obj/item/reagent_containers/glass/bottle/chlorine,
/obj/item/reagent_containers/glass/bottle/copper,
/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/fluorine,
/obj/item/reagent_containers/glass/bottle/hydrogen,
/obj/item/reagent_containers/glass/bottle/iodine,
/obj/item/reagent_containers/glass/bottle/lithium,
/obj/item/reagent_containers/glass/bottle/mercury,
/obj/item/reagent_containers/glass/bottle/nitrogen,
/obj/item/reagent_containers/glass/bottle/oxygen,
/obj/item/reagent_containers/glass/bottle/fluorine,
/obj/item/reagent_containers/glass/bottle/phosphorus,
/obj/item/reagent_containers/glass/bottle/silicon,
/obj/item/reagent_containers/glass/bottle/chlorine,
/obj/item/reagent_containers/glass/bottle/radium,
/obj/item/reagent_containers/glass/bottle/sacid,
/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/potassium,
/obj/item/reagent_containers/glass/bottle/radium,
/obj/item/reagent_containers/glass/bottle/sugar,
/obj/item/reagent_containers/glass/bottle/sodium,
/obj/item/reagent_containers/glass/bottle/sulfur,
/obj/item/reagent_containers/glass/bottle/silicon,
/obj/item/reagent_scanner,
/obj/item/reagent_containers/dropper,
/obj/item/storage/box/beakers)
Expand Down Expand Up @@ -53,61 +60,96 @@
Bulk materials
*/

/datum/supply_pack/chemistry/aluminium
name = "Bulk Aluminium Crate"
desc = "Contains a jug filled with 150u of aluminium."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium)
crate_name = "bulk aluminium crate"

/datum/supply_pack/chemistry/bromine
name = "Bulk Bromine Crate"
desc = "Contains a jug filled with 150u of bromine."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine)
crate_name = "bulk bromine crate"

/datum/supply_pack/chemistry/carbon
name = "Bulk Carbon Crate"
desc = "Contains a jug filled with 150u of carbon."
cost = 500
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/carbon)
crate_name = "bulk carbon crate"

/datum/supply_pack/chemistry/oxygen
name = "Bulk Oxygen Crate"
desc = "Contains a jug filled with 150u of oxygen."
cost = 500
contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen)
crate_name = "bulk oxygen crate"
/datum/supply_pack/chemistry/chlorine
name = "Bulk Chlorine Crate"
desc = "Contains a jug filled with 150u of chlorine."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine)
crate_name = "bulk chlorine crate"

/datum/supply_pack/chemistry/copper
name = "Bulk Copper Crate"
desc = "Contains a jug filled with 150u of copper."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/copper)
crate_name = "bulk copper crate"

/datum/supply_pack/chemistry/fluorine
name = "Bulk Fluorine Crate"
desc = "Contains a jug filled with 150u of fluorine."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/fluorine)
crate_name = "bulk fluorine crate"

/datum/supply_pack/chemistry/hydrogen
name = "Bulk Hydrogen Crate"
desc = "Contains a jug filled with 150u of Hydrogen."
cost = 500
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/hydrogen)
crate_name = "bulk hydrogen crate"

/datum/supply_pack/chemistry/iodine
name = "Bulk Iodine Crate"
desc = "Contains a jug filled with 150u of iodine."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine)
crate_name = "bulk iodine crate"

/datum/supply_pack/chemistry/lithium
name = "Bulk Lithium Crate"
desc = "Contains a jug filled with 150u of lithium."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/lithium)
crate_name = "bulk lithium crate"

/datum/supply_pack/chemistry/mercury
name = "Bulk Mercury Crate"
desc = "Contains a jug filled with 150u of mercury."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/mercury)
crate_name = "bulk mercury crate"

/datum/supply_pack/chemistry/nitrogen
name = "Bulk Nitrogen Crate"
desc = "Contains a jug filled with 150u of nitrogen."
cost = 625
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/nitrogen)
crate_name = "bulk nitrogen crate"

/datum/supply_pack/chemistry/aluminium
name = "Bulk Aluminium Crate"
desc = "Contains a jug filled with 150u of aluminium."
cost = 625
contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium)
crate_name = "bulk aluminium crate"

/datum/supply_pack/chemistry/copper
name = "Bulk Copper Crate"
desc = "Contains a jug filled with 150u of copper."
cost = 625
contains = list(/obj/item/reagent_containers/glass/chem_jug/copper)
crate_name = "bulk copper crate"

/datum/supply_pack/chemistry/bromine
name = "Bulk Bromine Crate"
desc = "Contains a jug filled with 150u of bromine."
cost = 625
contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine)
crate_name = "bulk bromine crate"
/datum/supply_pack/chemistry/oxygen
name = "Bulk Oxygen Crate"
desc = "Contains a jug filled with 150u of oxygen."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen)
crate_name = "bulk oxygen crate"

/datum/supply_pack/chemistry/iodine
name = "Bulk Iodine Crate"
desc = "Contains a jug filled with 150u of iodine."
/datum/supply_pack/chemistry/phosphorus
name = "Bulk Phosphorus Crate"
desc = "Contains a jug filled with 150u of phosphorus."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine)
crate_name = "bulk iodine crate"
contains = list(/obj/item/reagent_containers/glass/chem_jug/phosphorus)
crate_name = "bulk phosphorus crate"

/datum/supply_pack/chemistry/potassium
name = "Bulk Potassium Crate"
Expand All @@ -116,23 +158,23 @@
contains = list(/obj/item/reagent_containers/glass/chem_jug/potassium)
crate_name = "bulk potassium crate"

/datum/supply_pack/chemistry/radium
name = "Bulk Radium Crate"
desc = "Contains a jug filled with 150u of radium."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/radium)
crate_name = "bulk radium crate"

/datum/supply_pack/chemistry/sodium
name = "Bulk Sodium Crate"
desc = "Contains a jug filled with 150u of sodium."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/sodium)
crate_name = "bulk sodium crate"

/datum/supply_pack/chemistry/sulfur
name = "Bulk Sulfur Crate"
desc = "Contains a jug filled with 150u of sulfur."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/sulfur)
crate_name = "bulk sulfur crate"

/datum/supply_pack/chemistry/chlorine
name = "Bulk Chlorine Crate"
desc = "Contains a jug filled with 150u of chlorine."
cost = 750
contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine)
crate_name = "bulk chlorine crate"

/datum/supply_pack/chemistry/radium
name = "Bulk Radium Crate"
desc = "Contains a jug filled with 150u of radium."
cost = 1000
contains = list(/obj/item/reagent_containers/glass/chem_jug/radium)
crate_name = "bulk radium crate"
24 changes: 24 additions & 0 deletions code/modules/cargo/packs/food.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,17 @@
crate_name = "food crate"
crate_type = /obj/structure/closet/crate/freezer

/datum/supply_pack/food/sugar
name = "Sugar Crate"
desc = "A crate with a few bags of sugar. Good for cake shops and amateur chemists."
cost = 500
contains = list(/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar
)
crate_name = "sugar crate"
crate_type = /obj/structure/closet/crate

/*
Cooking
*/
Expand Down Expand Up @@ -238,6 +249,19 @@
crate_name = "gardening crate"
crate_type = /obj/structure/closet/crate/hydroponics

/datum/supply_pack/food/ethanol
name = "Ethanol Crate"
desc = "Five small bottles of ethanol for the aspiring botanist or amateur chemist."
cost = 750
contains = list(/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/ethanol,
/obj/item/reagent_containers/glass/bottle/ethanol
)
crate_name = "gardening crate"
crate_type = /obj/structure/closet/crate/hydroponics

/datum/supply_pack/food/weedcontrol
name = "Weed Control Crate"
desc = "Contains a scythe, gasmask, and two anti-weed defoliant grenades, for when your garden grows out of control."
Expand Down
28 changes: 15 additions & 13 deletions code/modules/cargo/packs/sec_supply.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,21 @@
crate_name = "combat knife crate"
*/

/datum/supply_pack/sec_supply/fire
name = "Incendiary Weapons Crate"
desc = "Burn, baby burn. Contains three incendiary grenades and three prebuilt flamethrowers."
cost = 5000
contains = list(
/obj/item/flamethrower/full,
/obj/item/flamethrower/full,
/obj/item/flamethrower/full,
/obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/incendiary,
)
crate_name = "incendiary weapons crate"
/datum/supply_pack/sec_supply/flamethrower
name = "Flamethrower Crate"
desc = "Contains one flamethrower. Point the nozzle away from anything important."
cost = 1250
contains = list(/obj/item/flamethrower/full)
crate_name = "flamethrower crate"
crate_type = /obj/structure/closet/crate/secure/weapon
faction = FACTION_NGR

/datum/supply_pack/sec_supply/incendiary_grenade
name = "Incendiary Grenade Crate"
desc = "Contains one incendiary grenade. Better not let it go off in your hands."
cost = 750
contains = list(/obj/item/grenade/chem_grenade/incendiary)
crate_name = "incendiary grenade crate"
crate_type = /obj/structure/closet/crate/secure/plasma
faction = FACTION_NGR

Expand Down
Loading

0 comments on commit f4450a3

Please sign in to comment.