cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-02-16 14:40:09 -07:00
committed by GitHub
parent 290206dee6
commit de4cc762f1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/pill_vr.dm
View File

@@ -147,9 +147,7 @@
. = ..() . = ..()
reagents.add_reagent("sleevingcure", 1) reagents.add_reagent("sleevingcure", 1)
color = reagents.get_color() color = reagents.get_color()
<<<<<<< HEAD
*/ //CHOMPStation removal end */ //CHOMPStation removal end
=======
/obj/item/weapon/reagent_containers/pill/airlock /obj/item/weapon/reagent_containers/pill/airlock
name = "\'Airlock\' Pill" name = "\'Airlock\' Pill"
@@ -160,4 +158,3 @@
..() ..()
reagents.add_reagent("anti_toxin", 15) reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent("paracetamol", 5) reagents.add_reagent("paracetamol", 5)
>>>>>>> b5e1cef4480... Merge pull request #12235 from Heroman3003/refill_cartridges