Merge branch 'master' into pawnch_2_the_pawnchening

This commit is contained in:
necromanceranne
2020-04-06 12:31:16 +10:00
committed by GitHub
64 changed files with 139463 additions and 2849 deletions
+2 -2
View File
@@ -235,7 +235,7 @@
/obj/structure/reagent_dispensers/keg/milk
name = "keg of milk"
desc = "It's not quite what you were hoping for."
desc = "A keg of pasteurised, homogenised, filtered and semi-skimmed space milk."
icon_state = "whitekeg"
reagent_id = /datum/reagent/consumable/milk
@@ -250,4 +250,4 @@
desc = "A keg of... wow that's a long name."
icon_state = "bluekeg"
reagent_id = /datum/reagent/consumable/ethanol/gargle_blaster
tank_volume = 100
tank_volume = 100