cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 08:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plushie Fixes & Additions (#17258)

Browse Source 
* tinytin plush

* missing var

* Fixes plushie speech. Plushies now speak to you. Cutely.

qol: Goes through and gives plushies speech bubbles pertaining to what they are.
fix: Fixes it so plushies now properly speak.
qol: Makes it so any interaction with plushies will play their phrase, NOT just disarm-intenting them (This was never made clear that disarm intent makes them speak.)
code: Gets rid of a few non-existent base paths by converting one of the paths into the base one. (plushy/therapy & plushies/squid)
fix: Fixes the toaster from having the sus plushie sound.
code: Changed some timers that were calling a proc that just set a var to false. Instead, we now use a varset_callback timer there.

* we are not the danger

* No name stealing.

* comment

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
Cameron Lennox
2025-03-10 01:58:04 -04:00
committed by GitHub
parent 7c2b3524a5
commit 34c7fc761e
9 changed files with 153 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/vending_machines.dm
+8 -8
View File
@@ -794,7 +794,7 @@
/obj/item/paper/card/cat = 3,
/obj/item/paper/card/flower = 3,
/obj/item/clothing/accessory/bracelet/friendship = 5,
/obj/item/toy/plushie/therapy/red = 2,
/obj/item/toy/plushie/therapy = 2,
/obj/item/toy/plushie/therapy/purple = 2,
/obj/item/toy/plushie/therapy/blue = 2,
/obj/item/toy/plushie/therapy/yellow = 2,
@@ -813,7 +813,6 @@
/obj/item/toy/plushie/deer = 1,
/obj/item/toy/plushie/tabby_cat = 1,
/obj/item/threadneedle = 3,
//VOREStation Add Start
/obj/item/toy/plushie/lizardplushie/kobold = 1,
/obj/item/toy/plushie/slimeplushie = 1,
/obj/item/toy/plushie/box = 1,
@@ -825,8 +824,9 @@
/obj/item/toy/plushie/otter = 1,
/obj/item/toy/plushie/vox = 1,
/obj/item/toy/plushie/shark = 1,
/obj/item/toy/mistletoe = 1)
//VOREStation Add End
/obj/item/toy/mistletoe = 1,
/obj/item/toy/plushie/tinytin = 1,
/obj/item/toy/plushie/tinytin_sec = 1)
premium = list(/obj/item/reagent_containers/food/drinks/bottle/champagne = 1,
/obj/item/storage/trinketbox = 2)
prices = list(/obj/item/storage/fancy/heartbox = 15,
@@ -837,7 +837,7 @@
/obj/item/paper/card/cat = 1,
/obj/item/paper/card/flower = 1,
/obj/item/clothing/accessory/bracelet/friendship = 5,
/obj/item/toy/plushie/therapy/red = 20,
/obj/item/toy/plushie/therapy = 20,
/obj/item/toy/plushie/therapy/purple = 20,
/obj/item/toy/plushie/therapy/blue = 20,
/obj/item/toy/plushie/therapy/yellow = 20,
@@ -856,7 +856,6 @@
/obj/item/toy/plushie/deer = 50,
/obj/item/toy/plushie/tabby_cat = 50,
/obj/item/threadneedle = 2,
//VOREStation Add Start
/obj/item/toy/plushie/lizardplushie/kobold = 50,
/obj/item/toy/plushie/slimeplushie = 50,
/obj/item/toy/plushie/box = 50,
@@ -868,8 +867,9 @@
/obj/item/toy/plushie/otter = 50,
/obj/item/toy/plushie/vox = 50,
/obj/item/toy/plushie/shark = 50,
/obj/item/toy/mistletoe = 50)
//VOREStation Add End
/obj/item/toy/mistletoe = 50,
/obj/item/toy/plushie/tinytin = 35,
/obj/item/toy/plushie/tinytin_sec = 50)
/obj/machinery/vending/fishing
code/modules/random_map/drop/drop_types.dm
+4 -2
View File
@@ -230,7 +230,9 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/toy/katana,
/obj/item/toy/katana,
/obj/item/inflatable_duck,
/obj/item/inflatable_duck)
/obj/item/inflatable_duck,
/obj/item/toy/plushie/tinytin,
/obj/item/toy/plushie/tinytin_sec)
/datum/supply_drop_loot/christmas
name = "Surplus Christmas Supplies"
@@ -320,4 +322,4 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/storage/box/syringes,
/obj/item/storage/box/autoinjectors)
/obj/item/storage/box/autoinjectors)