Merge branch 'master' into Cargo_MKII

This commit is contained in:
TrilbySpaceClone
2019-11-13 08:00:24 -05:00
1162 changed files with 6115 additions and 6988 deletions
+1 -1
View File
@@ -183,7 +183,7 @@
worth += gases[/datum/gas/bz]*4
worth += gases[/datum/gas/stimulum]*25
worth += gases[/datum/gas/hypernoblium]*1000
worth += gases[/datum/gas/miasma]*15
worth += gases[/datum/gas/miasma]*4
worth += gases[/datum/gas/tritium]*7
worth += gases[/datum/gas/pluoxium]*6
worth += gases[/datum/gas/nitryl]*30