Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-07-21 01:50:41 +01:00
committed by GitHub
115 changed files with 1351 additions and 473 deletions
@@ -23,6 +23,11 @@
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/lampplushie
/datum/gear/plushrng
name = "Random plushie"
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/random
/datum/gear/tennis
name = "Classic Tennis Ball"
category = SLOT_IN_BACKPACK