Merge branch 'master' into upstream-merge-33055

This commit is contained in:
LetterJay
2017-12-25 04:10:34 -06:00
committed by GitHub
687 changed files with 9555 additions and 5558 deletions
+1 -1
View File
@@ -162,7 +162,7 @@
* Sleepypens
*/
/obj/item/pen/sleepy
container_type = OPENCONTAINER_1
container_type = OPENCONTAINER
/obj/item/pen/sleepy/attack(mob/living/M, mob/user)