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

VS: Conflict Resolution + VS Changes

Browse Source 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
This commit is contained in:
Unknown
2020-03-31 11:00:26 -04:00
committed by Aronai Sieyes
parent a23797182f
commit dca2e93209
9 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/dispenser/dispenser_presets_vr.dm
View File

@@ -1,7 +1,5 @@
/obj/machinery/chemical_dispenser/xenoflora
name = "xenoflora chem dispenser"
icon = 'icons/obj/chemical_vr.dmi'
icon_state = "dispenser-small-green"
ui_title = "Xenoflora Chemical Dispenser"
dispense_reagents = list(
"water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium"
@@ -22,8 +20,6 @@
/obj/machinery/chemical_dispenser/biochemistry
name = "bioproduct dispenser"
icon = 'icons/obj/chemical_vr.dmi'
icon_state = "dispenser-small"
ui_title = "Bioproduct Dispenser"
dispense_reagents = list(
"nutriment", "protein", "milk"