Commit Graph

33 Commits

Author SHA1 Message Date
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Aronai Sieyes
d7283c9011 Merge pull request #10823 from VOREStation/Icons/toys
Some Eris toys, /tg/ mecha toy icons
2021-07-03 20:44:10 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess
Chessboard Holodeck TG-Style.
2021-06-02 16:03:06 +00:00
Nadyr
24c35497ff powder that makes you say yes 2021-05-29 22:20:06 -04:00
Chompstation Bot
501f383da4 [MIRROR] Make figurines small instead of normal sized 2021-05-29 18:55:11 +00:00
Nadyr
c1e068bd90 Update toys_vr.dm 2021-05-08 08:29:58 -04:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 14:42:49 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
kcin2001
7251099263 adds sif and station toy (reduces size of action figs too)
adds a sif toy and station toy, added to relevant sources and reduces size of action figures because they did not need to be so big
2021-03-05 01:15:58 -08:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Chompstation Bot
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +00:00
Razgriz
2b178a86b0 hhhhhhhhhh 2020-11-14 22:24:25 -07:00
Verkister
b7f4c2192c Merge pull request #9253 from VOREStation/upstream-merge-7748
[MIRROR] Adds new balloons
2020-10-27 08:17:38 +00:00
Braiden
a8d4104fea added tesh plush ears, fixed PEili not apearing on head. 2020-09-20 17:23:14 -05:00
Braiden
c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
Izac Joof Forsgren
d389a57133 Merge branch 'master' into kbraid.edit/additions 2020-09-16 13:38:00 +02:00
Braiden
565bb2a522 fixed a line 2020-09-15 19:35:29 -05:00
Braiden
55d8523787 teshari alternate placement slots (plush only)
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
2020-09-15 19:34:40 -05:00
Izac Joof Forsgren
4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Braiden
e463b40a20 fix 2020-09-11 16:53:17 -05:00
Braiden
8b0a2a285d tesh plushes can be held, they can be worn! 2020-09-11 14:56:56 -05:00
Braiden
b8319062fb Better sprites, more sprites!
Do not Merge first!
2020-09-11 04:22:47 -05:00
Braiden
ead7d70d97 a letter 2020-09-10 03:27:02 -05:00
Braiden
5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
izac112
e08fef0e70 fixeeees 2020-08-22 20:07:52 +02:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Rykka
5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Rykka
a5fc9d81ce Adds Mech Toy Battles!
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
2020-08-12 04:31:00 -04:00