Merge branch 'master' into izac

This commit is contained in:
Izac Joof Forsgren
2020-09-14 14:11:02 +02:00
committed by GitHub
11 changed files with 90 additions and 1 deletions
@@ -292,6 +292,12 @@
description = "M-M-M-M-MONEY SHOT"
ckeywhitelist = list("dopiotl")
character_name = list("Jeanne Petite")
/datum/gear/fluff/jeans_eiliplush
path = /obj/item/toy/plushie/teshari/eili
display_name = "Eili Plushi"
description = "My Favorite Pupil"
ckeywhitelist = list("dopiotl","kbraid")
character_name = list("Jeanne Petite","Eili","Braid")
//dwaggy90
//Saur Darastrix
/datum/gear/fluff/saur_rig