cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-06-23 20:58:49 +02:00
committed by GitHub
parent 72de7f458e
commit f1f73e813e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/vending_machines.dm
-6
View File
@@ -291,10 +291,7 @@
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin = 8,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8,
/obj/item/weapon/reagent_containers/pill/diet = 8,
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal, //CHOMPedit nah
=======
>>>>>>> 151562ea9b... Merge pull request #15060 from Youtubeboy139/sweatmax
/obj/item/weapon/towel/random = 8,
/obj/item/toy/tennis = 4)
@@ -314,10 +311,7 @@
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin = 5,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 5,
/obj/item/weapon/reagent_containers/pill/diet = 25,
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //CHOMPedit nah
=======
>>>>>>> 151562ea9b... Merge pull request #15060 from Youtubeboy139/sweatmax
/obj/item/weapon/towel/random = 20,
/obj/item/toy/tennis = 15)