cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-12165

Browse Source
This commit is contained in:
Nadyr
2022-02-06 21:53:14 -05:00
committed by GitHub
parent e6f02c05a6 77f4e9fb63
commit 6e44bb7876
41 changed files with 51113 additions and 14304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/drilling/drill.dm
View File

@@ -295,7 +295,7 @@
if(supports.len >= braces_needed)
supported = 1
else for(var/obj/machinery/mining/brace/check in supports)
if(check.brace_tier > 3)
if(check.brace_tier >= 3)
supported = 1
for(var/obj/machinery/mining/brace/check in supports)
total_brace_tier += check.brace_tier

1
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -123,6 +123,7 @@
EQUIPMENT("Plush Toy", /obj/random/plushie, 300),
EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200),
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000),
EQUIPMENT("Thalers - 1000", /obj/item/weapon/spacecash/c1000, 10000),
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125),
)