mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 16:48:12 +01:00
Merge branch 'master' into craft
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user