cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 10:34:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-8298

Browse Source
This commit is contained in:
Novacat
2022-03-22 08:53:45 -04:00
committed by GitHub
parent 997b44be91 1b0bd0d1a3
commit 4dbc7fe6bf
218 changed files with 4106 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/guns_and_ammo.dm
+3 -3
View File
@@ -460,9 +460,9 @@
/obj/item/ammo_magazine/s44
),
prob(1);list(
/obj/item/weapon/gun/projectile/revolver/webley/auto,
/obj/item/ammo_magazine/s44,
/obj/item/ammo_magazine/s44
/obj/item/weapon/gun/projectile/revolver/consul,
/obj/item/ammo_magazine/s44/rubber,
/obj/item/ammo_magazine/s44/rubber
)
)
code/game/objects/random/misc.dm
+39 -2
View File
@@ -848,7 +848,7 @@
/obj/item/weapon/reagent_containers/food/snacks/donut/plain,
/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack)
/obj/item/weapon/reagent_containers/food/snacks/cookie)
/obj/random/mre/dessert/vegan
name = "random vegan MRE dessert"
@@ -984,4 +984,41 @@
prob(6);/obj/item/device/flashlight/color/orange,
prob(6);/obj/item/device/flashlight/color/yellow,
prob(2);/obj/item/device/flashlight/maglight
)
)
/obj/random/mug
name = "Random Mug"
desc = "This is a random coffee mug."
icon = 'icons/obj/drinks_mugs.dmi'
icon_state = "coffeecup_spawner"
/obj/random/mug/item_to_spawn()
return pick(/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/sol,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fleet,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/fivearrows,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal/wulf,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/gilthari,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/wt,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/aether,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/oculum,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/one,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/puni,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/heart,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/pawn,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/diona,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/britcup,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/blue,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon)