Merge branch 'master' into craft

This commit is contained in:
FluffMedic
2023-06-20 15:26:56 -04:00
committed by GitHub
1233 changed files with 35670 additions and 14297 deletions
+10
View File
@@ -78,6 +78,15 @@
prob(9);/obj/item/weapon/cell/super,
prob(1);/obj/item/weapon/cell/hyper)
/obj/random/powercell/device
name = "random device powercell"
desc = "This is a random device powercell."
icon_state = "random_device"
/obj/random/powercell/device/item_to_spawn()
return pick(prob(80);/obj/item/weapon/cell/device,
prob(10);/obj/item/weapon/cell/device/hyper,
prob(10);/obj/item/weapon/cell/device/empproof)
/obj/random/bomb_supply
name = "bomb supply"
@@ -277,6 +286,7 @@
/obj/random/cash/item_to_spawn()
return pick(prob(320);/obj/random/maintenance/clean,
prob(12);/obj/item/weapon/spacecash/c1,
prob(10);/obj/item/weapon/spacecash/c5,
prob(8);/obj/item/weapon/spacecash/c10,
prob(4);/obj/item/weapon/spacecash/c20,
prob(1);/obj/item/weapon/spacecash/c50,
+1 -1
View File
@@ -189,7 +189,7 @@
prob(1);/obj/random/thermalponcho,
prob(5);/obj/random/contraband,
prob(5);/obj/random/cargopod,
prob(1);/obj/item/weapon/flame/lighter/random,
prob(1);/obj/item/weapon/flame/lighter,
prob(1);/obj/item/weapon/storage/wallet/random,
prob(1);/obj/random/cutout)