Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2018-12-15 19:37:28 +00:00
70 changed files with 3009 additions and 246 deletions

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)