Adds Rouny Doll (tgstation#6938)

* Rouny doll * i have no idea * map * Update code/game/objects/items/toys/toys.dm Co-authored-by: XSlayer300 <[email protected]> * Update code/game/objects/items/toys/toys.dm sure why noy Co-authored-by: XSlayer300 <[email protected]> * Update code/game/objects/items/toys/toys.dm Co-authored-by: XSlayer300 <[email protected]> * fairy * credits and shiz Co-authored-by: XSlayer300 <[email protected]>
Surrealaser · May 26, 2021 · 0bec0d0 · 0bec0d0
1 parent 379ac5a
commit 0bec0d0
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,10 @@ All icons in the PR:
 https://github.com/tgstation/TerraGov-Marine-Corps/pull/6010
 are licensed under CC-BY-NC-SA 3.0
 
+Rouny Sprite in the PR:
+https://github.com/tgstation/TerraGov-Marine-Corps/pull/6938
+are licensed under CC BY-SA 3.0
+
 Sound added in PR https://github.com/tgstation/TerraGov-Marine-Corps/pull/5604 is taken from https://freesound.org/people/nicStage/sounds/127731/ (CC Attribution)
 
 The TGS DMAPI API is licensed as a subproject under the MIT license.
diff --git a/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm b/_maps/map_files/Barrenquilla_Mining/Barrenquilla_Mining_Facility.dmm
@@ -1644,7 +1644,7 @@
 /turf/open/floor/marking/delivery,
 /area/barren/misc/genstorage)
 "hN" = (
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor,
 /area/shuttle/drop1/lz1)
 "hO" = (

diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -12475,7 +12475,7 @@
 /area/bigredv2/outside/general_store)
 "aWy" = (
 /obj/structure/bed,
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/tile/blue/whitebluefull,
 /area/bigredv2/outside/general_store)
 "aWz" = (

diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -24502,7 +24502,7 @@
 /area/ice_colony/underground/storage/highsec)
 "bFp" = (
 /obj/structure/table/reinforced,
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/tile/dark/blue2,
 /area/ice_colony/underground/storage/highsec)
 "bFq" = (

diff --git a/_maps/map_files/MarineHQ/MarineHQ.dmm b/_maps/map_files/MarineHQ/MarineHQ.dmm
@@ -1849,7 +1849,7 @@
 /area/mainship/hallways/hangar)
 "gm" = (
 /obj/structure/table/mainship,
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/wood,
 /area/mainship/squads/req)
 "gn" = (
@@ -2130,7 +2130,7 @@
 "hb" = (
 /obj/structure/cable,
 /obj/structure/bed/chair/sofa/right,
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/wood,
 /area/mainship/living/pilotbunks)
 "hc" = (

diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
@@ -2537,9 +2537,7 @@
 /obj/item/bedsheet/blue,
 /obj/effect/landmark/start/job/corporateliaison,
 /obj/structure/bed/fancy,
-/obj/item/toy/farwadoll{
-	pixel_x = 5
-	},
+/obj/item/toy/plush/farwa,
 /turf/open/floor/carpet{
 	dir = 1;
 	icon_state = "carpetside"

diff --git a/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm b/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm
@@ -32256,7 +32256,7 @@
 "bXo" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/wood,
 /area/prison/residential/south)
 "bXp" = (

diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm
@@ -1411,7 +1411,7 @@
 /obj/machinery/keycard_auth{
 	pixel_y = 25
 	},
-/obj/item/toy/farwadoll,
+/obj/item/toy/plush/farwa,
 /turf/open/floor/carpet{
 	dir = 6;
 	icon_state = "carpetside"

diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
@@ -7,7 +7,7 @@
 *		Crayons
 *		Snap pops
 *		Water flower
-*      Therapy dolls
+*      Dolls
 *      Inflatable duck
 *		Other things
 */
@@ -329,56 +329,6 @@
 	desc = "Mini-Mecha action figure! Collect them all! 11/11."
 	icon_state = "phazonprize"
 
-
-/obj/item/toy/therapy_red
-	name = "red therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is red."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapyred"
-	item_state = "egg4" // It's the red egg in items_left/righthand
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/toy/therapy_purple
-	name = "purple therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is purple."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapypurple"
-	item_state = "egg1" // It's the magenta egg in items_left/righthand
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/toy/therapy_blue
-	name = "blue therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is blue."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapyblue"
-	item_state = "egg2" // It's the blue egg in items_left/righthand
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/toy/therapy_yellow
-	name = "yellow therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is yellow."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapyyellow"
-	item_state = "egg5" // It's the yellow egg in items_left/righthand
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/toy/therapy_orange
-	name = "orange therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is orange."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapyorange"
-	item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/toy/therapy_green
-	name = "green therapy doll"
-	desc = "A toy for therapeutic and recreational purposes. This one is green."
-	icon = 'icons/obj/items/weapons.dmi'
-	icon_state = "therapygreen"
-	item_state = "egg3" // It's the green egg in items_left/righthand
-	w_class = WEIGHT_CLASS_TINY
-
-
 /obj/item/toy/inflatable_duck
 	name = "inflatable duck"
 	desc = "No bother to sink or swim when you can just float!"
@@ -437,8 +387,6 @@
 
 
 
-
-
 /obj/item/toy/bikehorn
 	name = "bike horn"
 	desc = "A horn off of a bicycle."
@@ -456,20 +404,126 @@
 	. = ..()
 	AddComponent(/datum/component/squeak, 'sound/items/bikehorn.ogg', 50)
 
-
-/obj/item/toy/farwadoll
-	name = "Farwa plush doll"
-	desc = "A Farwa plush doll. It's soft and comforting!"
+/obj/item/toy/plush
+	name = "generic doll"
+	desc = "An odd looking doll, it has a tag that reads: 'if found please return to coder.'"
 	w_class = WEIGHT_CLASS_TINY
-	icon_state = "farwaplush"
+	icon_state = "debug"
+	attack_verb = list("thumps", "whomps", "bumps")
 	var/last_hug_time
 
-/obj/item/toy/farwadoll/attack_self(mob/user)
+/obj/item/toy/plush/attack_self(mob/user)
 	if(world.time > last_hug_time)
 		user.visible_message("<span class='notice'>[user] hugs [src]! How cute! </span>", \
 							"<span class='notice'>You hug [src]. Dawwww... </span>")
 		last_hug_time = world.time + 50 //5 second cooldown
 
+/obj/item/toy/plush/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, 'sound/items/dollsqueak.ogg', 50)
+
+/obj/item/toy/plush/farwa
+	name = "Farwa plush doll"
+	desc = "A Farwa plush doll. It's soft and comforting!"
+	w_class = WEIGHT_CLASS_TINY
+	icon_state = "farwaplush"
+
+/obj/item/toy/plush/therapy_red
+	name = "red therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is red."
+	icon_state = "therapyred"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/therapy_purple
+	name = "purple therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is purple."
+	icon_state = "therapypurple"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/therapy_blue
+	name = "blue therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is blue."
+	icon_state = "therapyblue"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/therapy_yellow
+	name = "yellow therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is yellow."
+	icon_state = "therapyyellow"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/therapy_orange
+	name = "orange therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is orange."
+	icon_state = "therapyorange"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/therapy_green
+	name = "green therapy doll"
+	desc = "A toy for therapeutic and recreational purposes. This one is green."
+	icon_state = "therapygreen"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/toy/plush/carp
+	name = "carp plushie"
+	desc = "An adorable stuffed toy that resembles a carp."
+	icon_state = "carpplush"
+	item_state = "carp_plushie"
+	attack_verb = list("bites", "eats", "fin slaps")
+
+/obj/item/toy/plush/lizard
+	name = "lizard plushie"
+	desc = "An adorable stuffed toy that resembles a lizard."
+	icon_state = "lizplush"
+	item_state = "lizplush"
+	attack_verb = list("claws", "hisses", "tail slaps")
+
+/obj/item/toy/plush/snake
+	name = "snake plushie"
+	desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
+	icon_state = "snakeplush"
+	item_state = "snakeplush"
+	attack_verb = list("bites", "hisses", "tail slaps")
+
+/obj/item/toy/plush/slime
+	name = "slime plushie"
+	desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
+	icon_state = "slimeplush"
+	item_state = "slimeplush"
+	attack_verb = list("blorbles", "slimes", "absorbs")
+
+/obj/item/toy/plush/moth
+	name = "moth plushie"
+	desc = "A plushie depicting an adorable mothperson. It's a huggable bug!"
+	icon_state = "moffplush"
+	item_state = "moffplush"
+	attack_verb = list("flutters", "flaps")
+
+/obj/item/toy/plush/rouny
+	name = "rouny plushie"
+	desc = "A plushie depicting a rouny, made to commemorate the centenary of the battle of LV-426. Much cuddlier and soft than the real thing."
+	icon_state = "rounyplush"
+	item_state = "rounyplush"
+	attack_verb = list("slashes", "bites", "pounces")
+
+/obj/item/toy/plush/witch
+	name = "witch plushie"
+	desc = "A plushie depicting an adorable witch. It likes to steal books."
+	icon_state = "marisa"
+	item_state = "marisa"
+
+/obj/item/toy/plush/knight
+	name = "knight plushie"
+	desc = "A plushie depicting an adorable knight. It seems to be a trap."
+	icon_state = "astolfo"
+	item_state = "astolfo"
+
+/obj/item/toy/plush/fairy
+	name = "fairy plushie"
+	desc = "A plushie depicting an adorable fairy. It's cold to the touch."
+	icon_state = "cirno"
+	item_state = "cirno"
+
 
 /obj/item/toy/beach_ball/basketball
 	name = "basketball"

diff --git a/code/game/objects/machinery/computer/arcade.dm b/code/game/objects/machinery/computer/arcade.dm
@@ -12,17 +12,23 @@
 	var/enemy_mp = 20
 	var/gameover = 0
 	var/blocked = 0 //Player cannot attack/heal while set
-	var/list/prizes = list(	/obj/item/storage/box/MRE			    = 3,
-							/obj/item/spacecash/c10					= 4,
-							/obj/item/ammo_magazine/flamer_tank			    = 1,
-							/obj/item/tool/lighter/zippo			= 2,
-							/obj/item/tool/weldingtool					= 1,
-							/obj/item/storage/box/tgmc_mre			= 2,
-							/obj/item/camera				        	= 2,
-							/obj/item/camera_film					= 4,
-							/obj/item/cell/crap/empty				= 3,
-							/obj/item/tool/hand_labeler					= 1
-							)
+	var/list/prizes = list(
+		/obj/item/spacecash/c10	= 4,
+		/obj/item/tool/lighter/zippo = 2,
+		/obj/item/storage/box/tgmc_mre = 2,
+		/obj/item/camera = 2,
+		/obj/item/camera_film = 4,
+		/obj/item/toy/plush/farwa = 4,
+		/obj/item/toy/plush/carp = 2,
+		/obj/item/toy/plush/lizard = 2,
+		/obj/item/toy/plush/snake = 2,
+		/obj/item/toy/plush/slime = 2,
+		/obj/item/toy/plush/moth = 2,
+		/obj/item/toy/plush/rouny = 1,
+		/obj/item/toy/plush/witch = 1,
+		/obj/item/toy/plush/knight = 1,
+		/obj/item/toy/plush/fairy = 1,
+		)
 
 /obj/machinery/computer/arcade
 	var/turtle = 0

diff --git a/icons/obj/items/toy.dmi b/icons/obj/items/toy.dmi
diff --git a/sound/items/dollsqueak.ogg b/sound/items/dollsqueak.ogg
diff --git a/sound/voice/moth_scream.ogg b/sound/voice/moth_scream.ogg