Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit fe5f540

Browse files
fluffe9911fluffe9911
committed
Welcome to the toy shop baby
1 parent 0dcadd2 commit fe5f540

14 files changed

Lines changed: 1412 additions & 1 deletion

File tree

‎_maps/yogstation/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm‎

Lines changed: 1159 additions & 0 deletions
Large diffs are not rendered by default.

‎code/modules/cargo/packs.dm‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,10 @@
19821982
/obj/item/toy/plush/snakeplushie,
19831983
/obj/item/toy/plush/nukeplushie,
19841984
/obj/item/toy/plush/goatplushie,
1985+
/obj/item/toy/plush/teddybear,
1986+
/obj/item/toy/plush/stuffedmonkey,
1987+
/obj/item/toy/plush/flowerbunch,
1988+
/obj/item/toy/plush/inorixplushie,
19851989
/obj/item/toy/plush/slimeplushie)
19861990
crate_name = "plush crate"
19871991
crate_type = /obj/structure/closet/crate/wooden //YOGS end - plushie crate

‎yogstation.dme‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,6 +2819,7 @@
28192819
#include "yogstation\code\game\objects\items\crayons.dm"
28202820
#include "yogstation\code\game\objects\items\plushes.dm"
28212821
#include "yogstation\code\game\objects\items\sharpener.dm"
2822+
#include "yogstation\code\game\objects\items\toys.dm"
28222823
#include "yogstation\code\game\objects\items\circuitboards\computer_circuitboards.dm"
28232824
#include "yogstation\code\game\objects\items\circuitboards\machine_circuitboards.dm"
28242825
#include "yogstation\code\game\objects\items\devices\powersink.dm"
@@ -2976,6 +2977,7 @@
29762977
#include "yogstation\code\modules\mob\living\simple_animal\hostile\retaliate\dolphin.dm"
29772978
#include "yogstation\code\modules\mob\new_player\poll.dm"
29782979
#include "yogstation\code\modules\ninja\suit\ninja.dm"
2980+
#include "yogstation\code\modules\paperwork\photography.dm"
29792981
#include "yogstation\code\modules\power\hugbox.dm"
29802982
#include "yogstation\code\modules\power\lighting.dm"
29812983
#include "yogstation\code\modules\power\validhunter.dm"
@@ -3003,6 +3005,7 @@
30033005
#include "yogstation\code\modules\uplink\uplink_item.dm"
30043006
#include "yogstation\code\modules\vending\_vending.dm"
30053007
#include "yogstation\code\modules\vending\clothesmate.dm"
3008+
#include "yogstation\code\modules\vending\gift.dm"
30063009
#include "yogstation\code\modules\vending\wardrobes.dm"
30073010
#include "yogstation\code\modules\webhook\webhook.dm"
30083011
#include "yogstation\interface\interface.dm"

‎yogstation/code/datums/ruins/lavaland.dm‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/datum/map_template/ruin/lavaland/toyshop
2+
name = "Toy Shop"
3+
id = "toyshop"
4+
description = "A shop that has the entire collection of Nanotrasen brand action figures!."
5+
suffix = "lavaland_surface_cursedtoyshop.dmm"
6+
cost = 10
7+
allow_duplicates = FALSE

‎yogstation/code/game/objects/items/plushes.dm‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,28 @@
4646

4747
/obj/item/toy/plush/goatplushie/angry/Destroy()
4848
STOP_PROCESSING(SSprocessing, src)
49-
return ..()
49+
return ..()
50+
51+
/obj/item/toy/plush/teddybear
52+
name = "teddy bear"
53+
desc = "A soft brown bear you can cuddle with anywhere."
54+
icon = 'yogstation/icons/obj/toy.dmi'
55+
icon_state = "teddybear"
56+
57+
/obj/item/toy/plush/stuffedmonkey
58+
name = "stuffed monkey"
59+
desc = "Looks just like the live ones on station. Except this one is made from plush."
60+
icon = 'yogstation/icons/obj/toy.dmi'
61+
icon_state = "stuffedmonkey"
62+
63+
/obj/item/toy/plush/inorixplushie
64+
name = "inorix plushie"
65+
desc = "An adorable stuffed toy that resembles a giant robotic squid. It squirms around in your hand with realistic, buggy motion."
66+
icon_state = "plushie_inorix"
67+
attack_verb = list("harkened", "glared", "erased")
68+
69+
/obj/item/toy/plush/flowerbunch
70+
name = "flower bunch"
71+
desc = "Oh, a bunch of flowers to show you care!"
72+
icon = 'yogstation/icons/obj/toy.dmi'
73+
icon_state = "flowerbunch"

‎yogstation/code/game/objects/items/toys.dm‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
/obj/item/toy/heartballoon
2+
name = "heart balloon"
3+
desc = "A balloon for that special someone in your life."
4+
throwforce = 0
5+
throw_speed = 3
6+
throw_range = 7
7+
force = 0
8+
icon = 'yogstation/icons/obj/toy.dmi'
9+
icon_state = "heartballoon"
10+
item_state = "heartballoon"
11+
lefthand_file = 'icons/mob/inhands/antag/balloons_lefthand.dmi'
12+
righthand_file = 'icons/mob/inhands/antag/balloons_righthand.dmi'
13+
14+
15+
/obj/item/toy/toyballoon
16+
name = "toy balloon"
17+
desc = "A very colorful balloon, fun for all ages."
18+
throwforce = 0
19+
throw_speed = 3
20+
throw_range = 7
21+
force = 0
22+
icon = 'yogstation/icons/obj/toy.dmi'
23+
icon_state = "toyballoon"
24+
item_state = "toyballoon"
25+
lefthand_file = 'icons/mob/inhands/antag/balloons_lefthand.dmi'
26+
righthand_file = 'icons/mob/inhands/antag/balloons_righthand.dmi'
27+
28+
/obj/item/toy/toygrenade
29+
name = "toy grenade"
30+
desc = "Booooom!"
31+
icon = 'yogstation/icons/obj/toy.dmi'
32+
icon_state = "toygrenade"
33+
w_class = 1
34+
35+
throw_impact(atom/hit_atom)
36+
..()
37+
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
38+
s.set_up(3, 1, src)
39+
s.start()
40+
new /obj/effect/decal/cleanable/ash(src.loc)
41+
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
42+
playsound(src, 'sound/effects/snap.ogg', 50, 1)
43+
qdel(src)
44+
45+
/obj/item/toy/boomerang
46+
name = "boomerang"
47+
desc = "Actually comes back."
48+
icon_state = "boomerang"
49+
icon = 'yogstation/icons/obj/toy.dmi'
50+
force = 0
51+
throw_speed = 0.5
52+
throw_range = 10
53+
54+
/obj/item/toy/boomerang/throw_impact(atom/hit_atom)
55+
if(iscarbon(src.loc)) //Did someone catch it?
56+
return ..()
57+
throw_at(thrownby, throw_range+3, throw_speed, null)
58+
..()
59+
60+
/obj/item/toy/boomerang/throw_at(atom/target, range, speed, mob/thrower, spin=1)
61+
if(iscarbon(thrower))
62+
var/mob/living/carbon/C = thrower
63+
C.throw_mode_on()
64+
..()
65+
66+
/obj/item/toy/frisbee
67+
name = "frisbee"
68+
desc = "Comes further in life then you."
69+
icon_state = "frisbee"
70+
icon = 'yogstation/icons/obj/toy.dmi'
71+
force = 0
72+
throw_speed = 0.5
73+
throw_range = 14
74+
75+
/obj/item/toy/talking/figure/jexp
76+
name = "JEXP action figure"
77+
icon_state = "jexp"
78+
icon = 'yogstation/icons/obj/toy.dmi'
79+
messages = list(
80+
"150 rounds as Captain sounds PERFECT!",
81+
"Brig Officers! Perfect for newbies, but they'll get better costumes than regular officers!",
82+
"S H I T C O D E",
83+
"C O P Y P A S T A",
84+
"Whitelisting is the best listing!",
85+
"Incompetence can no longer exist! The heads must be PERFECT!")
86+
87+
/obj/item/toy/gun/toyglock
88+
name = "toy glock"
89+
desc = "Oh, looks just like the real thing, but it's only a toy."
90+
icon = 'yogstation/icons/obj/toy.dmi'
91+
icon_state = "toyglock"
92+
item_state = "toyglock"
93+
slot_flags = SLOT_BELT
94+
materials = list(MAT_METAL=10, MAT_GLASS=10)
95+
attack_verb = list("struck", "pistol whipped", "hit", "bashed")
96+
97+
/obj/item/toy/gun/toyflaregun
98+
name = "toy flare gun"
99+
desc = "For use in make believe emergencies."
100+
icon = 'yogstation/icons/obj/toy.dmi'
101+
icon_state = "toyflaregun"
102+
item_state = "toyflaregun"
103+
slot_flags = SLOT_BELT
104+
materials = list(MAT_METAL=10, MAT_GLASS=10)
105+
attack_verb = list("struck", "pistol whipped", "hit", "bashed")

‎yogstation/code/modules/clothing/under/miscellaneous.dm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/obj/item/clothing/under/rank/psyche
2+
name = "psychedelic jumpsuit"
3+
desc = "Groovy!"
4+
icon_state = "psyche"
5+
item_state = "rainbow"
6+
item_color = "psyche"

‎yogstation/code/modules/paperwork/photography.dm‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/obj/item/storage/photobook
2+
name = "photo book"
3+
icon = 'yogstation/icons/obj/toy.dmi'
4+
icon_state = "photobook"
5+
item_state = "photobook"
6+
w_class = WEIGHT_CLASS_TINY
7+
resistance_flags = FLAMMABLE
8+
9+
obj/item/storage/photobook/ComponentInitialize()
10+
. = ..()
11+
GET_COMPONENT(STR, /datum/component/storage)
12+
STR.max_w_class = WEIGHT_CLASS_NORMAL
13+
STR.max_combined_w_class = 70
14+
STR.max_items = 70
15+
STR.can_hold = typecacheof(/obj/item/photo)
16+
17+
/obj/item/storage/bag/photo
18+
name = "Photo Bag"
19+
desc = "This Satchel can be used to store all your photo related items."
20+
icon = 'yogstation/icons/obj/toy.dmi'
21+
icon_state = "photobag"
22+
w_class = WEIGHT_CLASS_TINY
23+
resistance_flags = FLAMMABLE
24+
25+
obj/item/storage/bag/photo/ComponentInitialize()
26+
. = ..()
27+
GET_COMPONENT(STR, /datum/component/storage)
28+
STR.max_w_class = WEIGHT_CLASS_NORMAL
29+
STR.max_combined_w_class = 50
30+
STR.max_items = 50
31+
STR.can_hold = typecacheof(/obj/item/camera_film,/obj/item/photo,/obj/item/storage/photo_album,/obj/item/camera,/obj/item/storage/photobook)

‎yogstation/code/modules/vending/gift.dm‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/obj/machinery/vending/gifts
2+
name = "\improper Gift Vendor"
3+
desc = "A vending machine for the gift shop."
4+
icon = 'yogstation/icons/obj/vending.dmi'
5+
icon_state = "gifts"
6+
icon_deny = "gifts-deny"
7+
req_access_txt = "36"
8+
product_slogans = "Toys For All!;Oh its a Gift!;A Gift for Your Loved ones!;Purchase more Gifts, Now!"
9+
vend_reply = "Thank you for using Gift Vendor!"
10+
products = list(/obj/item/toy/heartballoon = 3,
11+
/obj/item/toy/toyballoon = 3,
12+
/obj/item/toy/toyglock = 3,
13+
/obj/item/toy/toyflaregun = 3,
14+
/obj/item/toy/toygrenade = 15,
15+
/obj/item/toy/plush/teddybear = 5,
16+
/obj/item/toy/plush/stuffedmonkey = 5,
17+
/obj/item/toy/plush/flowerbunch = 5,
18+
/obj/item/camera_film = 30,
19+
/obj/item/storage/photo_album = 5,
20+
/obj/item/storage/photobook = 5,
21+
/obj/item/toy/frisbee = 2,
22+
/obj/item/toy/boomerang = 2,
23+
/obj/item/storage/bag/photo = 5,
24+
/obj/item/toy/plush/bubbleplush = 2,
25+
/obj/item/toy/plush/plushvar = 2,
26+
/obj/item/toy/plush/narplush = 2,
27+
/obj/item/toy/plush/lizardplushie = 2,
28+
/obj/item/toy/plush/snakeplushie = 2,
29+
/obj/item/toy/plush/nukeplushie = 2,
30+
/obj/item/toy/plush/slimeplushie = 2,
31+
/obj/item/toy/plush/inorixplushie = 2,
32+
/obj/item/storage/backpack = 4,
33+
/obj/item/reagent_containers/syringe = 3,
34+
/obj/item/reagent_containers/pill/patch/styptic = 2,
35+
/obj/item/reagent_containers/pill/patch/silver_sulf = 2,
36+
/obj/item/reagent_containers/glass/bottle/charcoal = 1,
37+
/obj/item/reagent_containers/pill/epinephrine = 1,
38+
/obj/item/reagent_containers/glass/beaker/large = 2,
39+
/obj/item/flashlight = 3,
40+
/obj/item/flashlight/flare = 1,
41+
/obj/item/storage/toolbox/mechanical = 1,
42+
/obj/item/stack/cable_coil/random = 4,
43+
/obj/item/pda = 8,
44+
/obj/item/cartridge/engineering = 2,
45+
/obj/item/cartridge/atmos = 2,
46+
/obj/item/cartridge/medical = 2,
47+
/obj/item/cartridge/chemistry = 2,
48+
/obj/item/cartridge/janitor = 2,
49+
/obj/item/cartridge/lawyer = 2,
50+
/obj/item/cartridge/curator = 2,
51+
/obj/item/cartridge/roboticist = 2,
52+
/obj/item/cartridge/quartermaster = 2)
53+
contraband = list(/obj/item/clothing/under/rank/psyche = 1,
54+
/obj/item/reagent_containers/hypospray/medipen/stimpack = 1,
55+
/obj/item/clothing/gloves/color/fyellow = 1,
56+
/obj/item/airlock_painter = 1,
57+
/obj/item/cartridge/security = 2,
58+
/obj/item/cartridge/detective = 2,
59+
/obj/item/cartridge/quartermaster = 2,
60+
/obj/item/cartridge/head = 2,
61+
/obj/item/cartridge/hop = 2,
62+
/obj/item/cartridge/hos = 2,
63+
/obj/item/cartridge/ce = 2,
64+
/obj/item/cartridge/cmo = 2,
65+
/obj/item/cartridge/rd = 2,
66+
/obj/item/cartridge/captain = 1)
67+
premium = list(/obj/item/multitool = 1,
68+
/obj/item/pda/clear = 1)
69+
70+
default_price = 50
71+
extra_price = 75
72+
payment_department = ACCOUNT_SRV

‎yogstation/icons/mob/inhands/antag/balloons_lefthand.dmi‎

1.03 KB
Binary file not shown.

0 commit comments

Comments
 (0)