cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update misc.dm

Browse Source
This commit is contained in:
C.L
2022-10-07 21:58:30 -04:00
committed by GitHub
parent d86e388bdb
commit 2563930d68
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/misc.dm
+24 -26
View File
@@ -313,7 +313,6 @@
icon_state = "soap"
/obj/random/soap/item_to_spawn()
<<<<<<< HEAD
return pick(prob(3);/obj/item/weapon/soap,
prob(2);/obj/item/weapon/soap/nanotrasen,
prob(2);/obj/item/weapon/soap/deluxe,
@@ -321,30 +320,29 @@
=======
return pick(/obj/item/soap,
/obj/item/soap/nanotrasen,
/obj/item/soap/deluxe,
/obj/item/soap/syndie,
/obj/item/soap/space_soap,
/obj/item/soap/space_soap,
/obj/item/soap/water_soap,
/obj/item/soap/fire_soap,
/obj/item/soap/rainbow_soap,
/obj/item/soap/diamond_soap,
/obj/item/soap/uranium_soap,
/obj/item/soap/silver_soap,
/obj/item/soap/brown_soap,
/obj/item/soap/white_soap,
/obj/item/soap/grey_soap,
/obj/item/soap/pink_soap,
/obj/item/soap/purple_soap,
/obj/item/soap/blue_soap,
/obj/item/soap/cyan_soap,
/obj/item/soap/green_soap,
/obj/item/soap/yellow_soap,
/obj/item/soap/orange_soap,
/obj/item/soap/red_soap,
/obj/item/soap/golden_soap)
>>>>>>> a4b3804617d... Merge pull request #8726 from Cerebulon/sope
/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"
@@ -1063,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)