From 1f227a9b5585a5bed93e2fb6cc3629bc0fee7722 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 3 Feb 2020 17:49:54 -0800
Subject: [PATCH] Merge pull request #6664 from PrismaticGynoid/loadouttoys

Adds some toys to the loadout
---
 code/game/objects/items/toys.dm               |  2 +-
 .../loadout/loadout_general.dm                | 30 +++++++++++++++++++
 .../PrismaticGynoid - loadouttoys.yml         |  6 ++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/PrismaticGynoid - loadouttoys.yml

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 92269ead776..fca7ae8ca79 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -405,7 +405,7 @@
 		return
 
 	else if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
-		A.reagents.trans_to(src, 10)
+		A.reagents.trans_to_obj(src, 10)
 		user << "<span class='notice'>You refill your flower!</span>"
 		return
 
diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 34a806fe325..06c5948aeb8 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -50,6 +50,36 @@
 		plushies[initial(plushie_type.name)] = plushie_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies))
 
+/datum/gear/figure
+	display_name = "action figure selection"
+	description = "A \"Space Life\" brand action figure."
+	path = /obj/item/toy/figure/
+
+/datum/gear/figure/New()
+	..()
+	var/list/figures = list()
+	for(var/figure in typesof(/obj/item/toy/figure/) - /obj/item/toy/figure)
+		var/obj/item/toy/figure/figure_type = figure
+		figures[initial(figure_type.name)] = figure_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(figures))
+
+/datum/gear/toy
+	display_name = "toy selection"
+	description = "Choose from a number of toys."
+	path = /obj/item/toy/
+
+/datum/gear/toy/New()
+	..()
+	var/toytype = list()
+	toytype["Blink toy"] = /obj/item/toy/blink
+	toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy
+	toytype["Water flower"] = /obj/item/toy/waterflower
+	toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle
+	toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
+	toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
+	gear_tweaks += new/datum/gear_tweak/path(toytype)
+
+
 /datum/gear/flask
 	display_name = "flask"
 	path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
diff --git a/html/changelogs/PrismaticGynoid - loadouttoys.yml b/html/changelogs/PrismaticGynoid - loadouttoys.yml
new file mode 100644
index 00000000000..ac451b8129c
--- /dev/null
+++ b/html/changelogs/PrismaticGynoid - loadouttoys.yml	
@@ -0,0 +1,6 @@
+author: PrismaticGynoid
+
+delete-after: True
+
+changes: 
+  - rscadd: "Adds a few toys to the loadout."