cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-12 02:11:06 +01:00
committed by GitHub
co-authored by Heroman3003 Kashargul
parent d5b62d4159
commit fd5d9267ff
622 changed files with 11273 additions and 9558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+2 -2
View File
@@ -108,7 +108,7 @@
EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
@@ -120,7 +120,7 @@
EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000),
EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000),
EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200),
EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500),
//CHOMPedit Start
EQUIPMENT("Mining PSG", /obj/item/personal_shield_generator/belt/mining/loaded, 2000),
code/modules/mining/ore_redemption_machine/survey_vendor.dm
+4 -4
View File
@@ -12,8 +12,8 @@
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90),
@@ -108,8 +108,8 @@
EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),