cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 05:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-10-16 22:52:41 +02:00
parent 2d2e1a9d46 d92e5d3e28
commit dc36fe9b8f
501 changed files with 22581 additions and 19177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/guns_and_ammo.dm
+7 -1
View File
@@ -98,6 +98,7 @@
prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,
prob(2);/obj/item/weapon/gun/projectile/shotgun/semi,
prob(2);/obj/item/weapon/gun/projectile/silenced)
/obj/random/projectile/sec
@@ -119,7 +120,8 @@
return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn,
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,
prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat)
prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
prob(1);/obj/item/weapon/gun/projectile/shotgun/semi)
/obj/random/handgun
name = "Random Handgun"
@@ -494,6 +496,10 @@
prob(1);list(
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/ammo_magazine/ammo_box/b12g
),
prob(1);list(
/obj/item/weapon/gun/projectile/shotgun/semi,
/obj/item/ammo_magazine/ammo_box/b12g
)
)
code/game/objects/random/mapping.dm
+3 -3
View File
@@ -77,14 +77,14 @@
prob(3);/obj/machinery/vending/fitness,
prob(4);/obj/machinery/vending/cigarette,
prob(3);/obj/machinery/vending/giftvendor,
prob(1);/obj/machinery/vending/hotfood,
prob(5);/obj/machinery/vending/weeb,
prob(5);/obj/machinery/vending/sol,
prob(5);/obj/machinery/vending/snix,
prob(5);/obj/machinery/vending/snlvend,
prob(5);/obj/machinery/vending/sovietsoda,
prob(5);/obj/machinery/vending/sovietvend,
prob(5);/obj/machinery/vending/radren) //VOREStation Edit End
prob(5);/obj/machinery/vending/radren,
prob(3);/obj/machinery/vending/altevian) //VOREStation Edit End
/obj/random/vendorfood //Random food vendors for station use
name = "random snack vending machine"
@@ -1661,4 +1661,4 @@
prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged),
prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill),
)
//VOREStation Add End
//VOREStation Add End
code/game/objects/random/misc.dm
+25 -6
View File
@@ -313,11 +313,30 @@
icon_state = "soap"
/obj/random/soap/item_to_spawn()
return pick(prob(3);/obj/item/weapon/soap,
prob(2);/obj/item/weapon/soap/nanotrasen,
prob(2);/obj/item/weapon/soap/deluxe,
prob(1);/obj/item/weapon/soap/syndie)
return pick(/obj/item/weapon/soap,
/obj/item/weapon/soap/nanotrasen,
/obj/item/weapon/soap/deluxe,
/obj/item/weapon/soap/syndie,
/obj/item/weapon/soap/space_soap,
/obj/item/weapon/soap/space_soap,
/obj/item/weapon/soap/water_soap,
/obj/item/weapon/soap/fire_soap,
/obj/item/weapon/soap/rainbow_soap,
/obj/item/weapon/soap/diamond_soap,
/obj/item/weapon/soap/uranium_soap,
/obj/item/weapon/soap/silver_soap,
/obj/item/weapon/soap/brown_soap,
/obj/item/weapon/soap/white_soap,
/obj/item/weapon/soap/grey_soap,
/obj/item/weapon/soap/pink_soap,
/obj/item/weapon/soap/purple_soap,
/obj/item/weapon/soap/blue_soap,
/obj/item/weapon/soap/cyan_soap,
/obj/item/weapon/soap/green_soap,
/obj/item/weapon/soap/yellow_soap,
/obj/item/weapon/soap/orange_soap,
/obj/item/weapon/soap/red_soap,
/obj/item/weapon/soap/golden_soap)
/obj/random/drinkbottle
name = "random drink"
@@ -1042,4 +1061,4 @@
/obj/item/weapon/storage/box/donkpockets/pizza,
/obj/item/weapon/storage/box/donkpockets/honk,
/obj/item/weapon/storage/box/donkpockets/gondola,
/obj/item/weapon/storage/box/donkpockets/berry)
/obj/item/weapon/storage/box/donkpockets/berry)