Merge pull request #5117 from CHOMPStation2/upstream-merge-13868

[MIRROR] [MIRROR] Rub A Dub Dub [READY FOR MERGE]
This commit is contained in:
Nadyr
2022-10-11 20:37:18 -04:00
committed by GitHub
3 changed files with 109 additions and 8 deletions
+24 -5
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"