Merge branch 'master' into upstream-merge-38179

This commit is contained in:
deathride58
2018-06-05 21:32:22 +00:00
committed by GitHub
174 changed files with 6159 additions and 5529 deletions
-1
View File
@@ -136,7 +136,6 @@
/mob/living/simple_animal/drone/snowflake/bardrone
name = "Bardrone"
desc = "A barkeeping drone, an indestructible robot built to tend bars."
seeStatic = FALSE
hacked = TRUE
laws = "1. Serve drinks.\n\
2. Talk to patrons.\n\