cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

More merge conflict fixes

Browse Source 
I think I got them all.
This commit is contained in:
Unknown
2018-12-13 00:33:32 -05:00
parent a7f5702981
commit b48efb138f
3 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/reagents/reagent_containers/glass/bottle_vr.dm
View File

@@ -1,13 +0,0 @@
/obj/item/weapon/reagent_containers/glass/bottle/ickypak
name = "ickypak bottle"
desc = "A small bottle of ickypak. The smell alone makes you gag."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("ickypak" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/unsorbitol
name = "unsorbitol bottle"
desc = "A small bottle of unsorbitol. Sickeningly sweet."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
prefill = list("unsorbitol" = 60)