Merge pull request #119 from ZomgPonies/master

sync
This commit is contained in:
melandor0
2014-11-24 02:45:57 +01:00
283 changed files with 33228 additions and 28927 deletions
+1 -1
View File
@@ -15,7 +15,7 @@
spawntypes = list(
/obj/item/device/mass_spectrometer/adv=1,
/obj/item/clothing/glasses/hud/health=1,
/obj/machinery/bot/medbot/mysterious=1
/obj/machinery/bot/medbot/syndicate=1
)
fluffitems = list(
/obj/effect/decal/cleanable/blood=5,