mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-30 19:41:56 +00:00
7de062f78e
* All hail The Pickle Jar, harbringer of better crafting (#73939) ## About The Pull Request Fixes #73841 --- _It is the 12th of March, 2023. Around 3am. I have published a Pull Request which involves circuits, and got reminded of my low GBP. I go into the issues tab to see if there's anything someone of my low skill caliber could tackle. I see it; Pickles. "How hard could I be?" I ask myself, foolishly unaware of the dangers that would soon overcome me. Surely it must've been a mistype, I thought. Surely someone accidentally confused pickles and cucumbers. "Wait, the pickles are supposed to be created on the jar when the jar is created", I say foolishly. "Wait, its putting the ingredients used for the jar in the jar, that doesn't explain why the pickles aren't there though", I say foolishly "Wait, whoever tried fixing this earlier fucking qdel'd the beaker and called it a day????", I say, foolishly._ --- Anyways I changed how the crafting menu distincts between categories, instead of checking whether or not the path is for food, it checks the actual categories themselves (why didn't it do this already), meaning that you can have non-food items on the food tab if it has a food category. Did this by adding a list that includes all crafting categories, so in the future when adding new categories you'll have to add them twice, which sucks, but oh well. Also added a new variable to craftable items, which makes it so that you can not delete a container's contents if you so wish (why was this the default). All this so that when you craft pickles, it actually crafts pickles instead of cucumbers. I spent hours on this, its 6:30am as I'm typing this. I'm tired. Fucking pickles. Super duper ultra thanks to FinalPotato for guiding me and suffering with me through this and teaching me so much about DM and BYOND. I cannot emphasize just how helpful and awesome they were thank you thank you thank you <3 ## Why It's Good For The Game Bug fixing be good ## Changelog 🆑 fix: The jar of pickles, after millenia, finally actually contains pickles. All hail the jar of pickles. /🆑 * All hail The Pickle Jar, harbringer of better crafting --------- Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>
205 lines
4.9 KiB
Plaintext
205 lines
4.9 KiB
Plaintext
/*ALL DEFINES RELATED TO CONSTRUCTION, CONSTRUCTING THINGS, OR CONSTRUCTED OBJECTS GO HERE*/
|
|
|
|
//Defines for construction states
|
|
|
|
//girder construction states
|
|
#define GIRDER_NORMAL 0
|
|
#define GIRDER_REINF_STRUTS 1
|
|
#define GIRDER_REINF 2
|
|
#define GIRDER_DISPLACED 3
|
|
#define GIRDER_DISASSEMBLED 4
|
|
#define GIRDER_TRAM 5
|
|
|
|
//rwall construction states
|
|
#define INTACT 0
|
|
#define SUPPORT_LINES 1
|
|
#define COVER 2
|
|
#define CUT_COVER 3
|
|
#define ANCHOR_BOLTS 4
|
|
#define SUPPORT_RODS 5
|
|
#define SHEATH 6
|
|
|
|
//window construction states
|
|
#define WINDOW_OUT_OF_FRAME 0
|
|
#define WINDOW_IN_FRAME 1
|
|
#define WINDOW_SCREWED_TO_FRAME 2
|
|
|
|
//reinforced window construction states
|
|
#define RWINDOW_FRAME_BOLTED 3
|
|
#define RWINDOW_BARS_CUT 4
|
|
#define RWINDOW_POPPED 5
|
|
#define RWINDOW_BOLTS_OUT 6
|
|
#define RWINDOW_BOLTS_HEATED 7
|
|
#define RWINDOW_SECURE 8
|
|
|
|
//airlock assembly construction states
|
|
#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
|
|
#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
|
|
#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2
|
|
|
|
//blast door (de)construction states
|
|
#define BLASTDOOR_NEEDS_WIRES 0
|
|
#define BLASTDOOR_NEEDS_ELECTRONICS 1
|
|
#define BLASTDOOR_FINISHED 2
|
|
|
|
//default_unfasten_wrench() return defines
|
|
#define CANT_UNFASTEN 0
|
|
#define FAILED_UNFASTEN 1
|
|
#define SUCCESSFUL_UNFASTEN 2
|
|
|
|
//ai core defines
|
|
#define EMPTY_CORE 0
|
|
#define CIRCUIT_CORE 1
|
|
#define SCREWED_CORE 2
|
|
#define CABLED_CORE 3
|
|
#define GLASS_CORE 4
|
|
#define AI_READY_CORE 5
|
|
|
|
//Construction defines for the pinion airlock
|
|
#define GEAR_SECURE 1
|
|
#define GEAR_LOOSE 2
|
|
|
|
//floodlights because apparently we use defines now
|
|
#define FLOODLIGHT_NEEDS_WIRES 0
|
|
#define FLOODLIGHT_NEEDS_LIGHTS 1
|
|
#define FLOODLIGHT_NEEDS_SECURING 2
|
|
|
|
// Stationary gas tanks
|
|
#define TANK_FRAME 0
|
|
#define TANK_PLATING_UNSECURED 1
|
|
|
|
//other construction-related things
|
|
|
|
//windows affected by Nar'Sie turn this color.
|
|
#define NARSIE_WINDOW_COLOUR "#7D1919"
|
|
|
|
//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
|
|
#define MINERAL_MATERIAL_AMOUNT 2000
|
|
//The maximum size of a stack object.
|
|
#define MAX_STACK_SIZE 50
|
|
//maximum amount of cable in a coil
|
|
#define MAXCOIL 30
|
|
|
|
//food/drink crafting defines
|
|
//When adding new defines, please make sure to also add them to the encompassing list
|
|
#define CAT_FOOD "Foods"
|
|
#define CAT_BREAD "Breads"
|
|
#define CAT_BURGER "Burgers"
|
|
#define CAT_CAKE "Cakes"
|
|
#define CAT_EGG "Egg-Based Food"
|
|
#define CAT_LIZARD "Lizard Food"
|
|
#define CAT_MEAT "Meats"
|
|
#define CAT_SEAFOOD "Seafood"
|
|
#define CAT_MISCFOOD "Misc. Food"
|
|
#define CAT_MEXICAN "Mexican Food"
|
|
#define CAT_MOTH "Mothic Food"
|
|
#define CAT_PASTRY "Pastries"
|
|
#define CAT_PIE "Pies"
|
|
#define CAT_PIZZA "Pizzas"
|
|
#define CAT_SALAD "Salads"
|
|
#define CAT_SANDWICH "Sandwiches"
|
|
#define CAT_SOUP "Soups"
|
|
#define CAT_SPAGHETTI "Spaghettis"
|
|
#define CAT_ICE "Frozen"
|
|
#define CAT_DRINK "Drinks"
|
|
|
|
GLOBAL_LIST_INIT(crafting_category_food, list(
|
|
CAT_FOOD,
|
|
CAT_BREAD,
|
|
CAT_BURGER,
|
|
CAT_CAKE,
|
|
CAT_EGG,
|
|
CAT_LIZARD,
|
|
CAT_MEAT,
|
|
CAT_SEAFOOD,
|
|
CAT_MISCFOOD,
|
|
CAT_MEXICAN,
|
|
CAT_MOTH,
|
|
CAT_PASTRY,
|
|
CAT_PIE,
|
|
CAT_PIZZA,
|
|
CAT_SALAD,
|
|
CAT_SANDWICH,
|
|
CAT_SOUP,
|
|
CAT_SPAGHETTI,
|
|
CAT_ICE,
|
|
CAT_DRINK,
|
|
))
|
|
|
|
//crafting defines
|
|
//When adding new defines, please make sure to also add them to the encompassing list
|
|
#define CAT_WEAPON_RANGED "Weapons Ranged"
|
|
#define CAT_WEAPON_MELEE "Weapons Melee"
|
|
#define CAT_WEAPON_AMMO "Weapon Ammo"
|
|
#define CAT_ROBOT "Robotics"
|
|
#define CAT_MISC "Misc"
|
|
#define CAT_CLOTHING "Clothing"
|
|
#define CAT_CHEMISTRY "Chemistry"
|
|
#define CAT_ATMOSPHERIC "Atmospherics"
|
|
#define CAT_STRUCTURE "Structures"
|
|
#define CAT_TILES "Tiles"
|
|
#define CAT_WINDOWS "Windows"
|
|
#define CAT_DOORS "Doors"
|
|
#define CAT_FURNITURE "Furniture"
|
|
#define CAT_EQUIPMENT "Equipment"
|
|
#define CAT_CONTAINERS "Containers"
|
|
#define CAT_ENTERTAINMENT "Entertainment"
|
|
#define CAT_TOOLS "Tools"
|
|
#define CAT_CULT "Blood Cult"
|
|
|
|
GLOBAL_LIST_INIT(crafting_category, list(
|
|
CAT_WEAPON_RANGED,
|
|
CAT_WEAPON_MELEE,
|
|
CAT_WEAPON_AMMO,
|
|
CAT_ROBOT,
|
|
CAT_MISC,
|
|
CAT_CLOTHING,
|
|
CAT_CHEMISTRY,
|
|
CAT_ATMOSPHERIC,
|
|
CAT_STRUCTURE,
|
|
CAT_TILES,
|
|
CAT_WINDOWS,
|
|
CAT_DOORS,
|
|
CAT_FURNITURE,
|
|
CAT_EQUIPMENT,
|
|
CAT_CONTAINERS,
|
|
CAT_ENTERTAINMENT,
|
|
CAT_TOOLS,
|
|
CAT_CULT,
|
|
))
|
|
|
|
//rcd modes
|
|
#define RCD_FLOORWALL 0
|
|
#define RCD_AIRLOCK 1
|
|
#define RCD_DECONSTRUCT 2
|
|
#define RCD_WINDOWGRILLE 3
|
|
#define RCD_MACHINE 4
|
|
#define RCD_COMPUTER 5
|
|
#define RCD_FURNISHING 6
|
|
#define RCD_CATWALK 7
|
|
#define RCD_FLOODLIGHT 8
|
|
#define RCD_WALLFRAME 9
|
|
#define RCD_REFLECTOR 10
|
|
|
|
|
|
#define RCD_UPGRADE_FRAMES (1<<0)
|
|
#define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1)
|
|
#define RCD_UPGRADE_SILO_LINK (1<<2)
|
|
#define RCD_UPGRADE_FURNISHING (1<<3)
|
|
|
|
#define RPD_UPGRADE_UNWRENCH (1<<0)
|
|
|
|
#define RCD_WINDOW_FULLTILE "full tile"
|
|
#define RCD_WINDOW_DIRECTIONAL "directional"
|
|
#define RCD_WINDOW_NORMAL "glass"
|
|
#define RCD_WINDOW_REINFORCED "reinforced glass"
|
|
|
|
#define RCD_MEMORY_WALL 1
|
|
#define RCD_MEMORY_WINDOWGRILLE 2
|
|
|
|
// How much faster to use the RCD when on a tile with memory
|
|
#define RCD_MEMORY_SPEED_BUFF 5
|
|
|
|
/// How much less resources the RCD uses when reconstructing
|
|
#define RCD_MEMORY_COST_BUFF 8
|