Merge branch 'master' into promwaterchemreagentreadd

This commit is contained in:
Repede
2020-02-17 08:24:30 -05:00
committed by GitHub
13 changed files with 18 additions and 24 deletions
@@ -210,13 +210,13 @@
character_name = list("Korei Laskor")
//championfire
//Anoki Windroar
//Yuki Windroar
/datum/gear/fluff/anoki_implant
path = /obj/item/weapon/implanter/reagent_generator/roiz/anoki
path = /obj/item/weapon/implanter/reagent_generator/roiz/yuki
display_name = "Egg laying implanter"
description = "This is an implant that allows the user to lay eggs."
ckeywhitelist = list("championfire")
character_name = list("Anoki Windroar")
character_name = list("Yuki Windroar")
//Ivy Kaeire
/datum/gear/fluff/ivy_under