Commit Graph

8591 Commits

Author SHA1 Message Date
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
Cyantime
1ccbf75ac9 Fix mob_spawner death checking 2020-08-09 22:11:20 -04:00
Novacat
be7206526a Merge pull request #8595 from lbnesquik/Kot-Janihound-tweak
Add a belly size upgrade for hounds and fix an important typo.
2020-08-08 16:30:46 -04:00
Cerebulon
d8f99719be disables footprint persistence (#7415) 2020-08-07 00:10:27 -04:00
Novacat
5dcbaf77cd Merge pull request #8605 from Novacat/nova-shuttle
Translocator and Micromech Tweaks
2020-08-06 15:45:16 -04:00
Novacat
404bd5d4cc Merge pull request #8611 from VOREStation/upstream-merge-7403
[MIRROR] Mechtoy and arcade
2020-08-06 15:03:43 -04:00
Atermonera
8ca03da239 Merge pull request #7403 from dwinters99/mechtoy-and-arcade
Mechtoy and arcade
2020-08-06 14:45:03 -04:00
Atermonera
2830f4e35c Merge pull request #7390 from Cerebulon/schneemobs
Adds some surface mobs.
2020-08-06 14:22:46 -04:00
Novacat
369e3448ed Merge pull request #8602 from VOREStation/upstream-merge-7361
[MIRROR] Overdose changes + General chem mods
2020-08-06 02:59:32 -04:00
Unknown
ac0831882f Translocator and Micromech Tweaks
- Translocators now have a delay similar to hypospray for targets not on help intent. Targets with AI will also have the delay
- Micromechs no longer have thicc armor
2020-08-05 22:57:10 -04:00
Atermonera
22cec61b86 Think with Portals 2020-08-05 21:45:49 -04:00
Atermonera
012a4a290c Overdose changes + General chem mods 2020-08-05 20:53:32 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik
c01019c25e Add a belly size upgrade for hounds:
- Researchable upgrade. It fits only hounds. It doubles the capacity of their sleeper for items. Usable only once. This does not affect number of patients.
2020-08-05 14:53:24 +02:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags.
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
2020-08-02 22:22:27 +02:00
Novacat
b67d52dce5 Merge pull request #8573 from VOREStation/upstream-merge-7404
[MIRROR] Fuel spills no longer persistent
2020-08-02 02:08:59 -04:00
Atermonera
2e93636b24 Merge pull request #7404 from Cerebulon/fuelbgone
Fuel spills no longer persistent
2020-08-02 00:23:52 -04:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Cyantime
2b82bb0fdb Fixes egg icons, probably 2020-08-01 02:03:02 -04:00
Cyantime
c70900f3f1 Fixes ambiguity of pizza portal location 2020-07-31 23:11:38 -04:00
Novacat
c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377
[MIRROR] Species Vars Extension Pt3: Blood!
2020-07-31 17:19:01 -04:00
Novacat
2ccb99611e Update medical_stand_vr.dm 2020-07-31 17:01:26 -04:00
Unknown
54d0193353 Fixes Stand 2020-07-31 16:54:33 -04:00
Heroman
00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Unknown
f4398a4f89 Reverts vorestation edit to large crate
Fixes invisible crates.
2020-07-29 20:32:44 -04:00
ShadowLarkens
4f2bb7bc34 Fix ghosts being unable to interact with TGUI by default 2020-07-28 01:16:00 -07:00
ShadowLarkens
c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires
# Conflicts:
#	code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:34:13 -04:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Novacat
77d6c2b33e Update largecrate.dm 2020-07-21 22:31:40 -04:00
Cerebulon
4a87460ba8 Flavour Enhancement: Crates 2020-07-21 22:20:30 -04:00
Novacat
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff
Adds dragon-y language and "*gao" emote
2020-07-21 18:12:43 -04:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
Rykka
df7bb084f1 Bugfixes, Feature Tweaks, and Final Touches
Microwave not cooking micros/mice: Fixed
Invalid Recipe datum thanks to /microwave prefix: Fixed
Fryer earsplittingly loud: Fixed
Fryer/Oven continuing to cook even after items removed: Fixed
Oven having 'on' icon state when door closed but off: Fixed
Appliances not scaling cooking time/damage based on size: Fixed
Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke!
Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention)
Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
2020-07-17 23:58:33 -04:00
ShadowLarkens
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added
Now onto the bugfixing nightmares!
2020-07-16 00:37:22 -04:00
Rykka
940aaec9c8 WIP Aurora Cooking Port
This ports Aurora Cooking, sometimes called Nanako Cooking, from CitRP, who got it from Aurora originally. 

https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/608

Pulled from here with updates to to_chat()

Ovens and fryers now work like the microwave, but also have special trays/baskets that can be inserted and removed with things on them. There's also a crapton of new recipes. Note that you can still use the oven to just bake things, or produce variable food items, to my knowledge. This was specifically kept in when it was originally implemented, IIRC.

- Cooking now uses several machines to make recipes. Microwave, oven, deep fryer.
- Recipes have been redone to reflect this.
- Adds a reagent called Space Spice (used in Synnono's food recipes mostly, prevents recipe conflicts)
- New foods! Lots of them.
- You can cook using held mobs. Also, mouse/ratburgers.
I can dump the recipes if you'd like.

https://user-images.githubusercontent.com/40557659/52112070-10165a80-25cb-11e9-9a72-2c919f0033dd.png (From their PR, may not be accurate).

This is WIP, and will not compile just yet.
2020-07-14 17:04:52 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Rykka
9c66b2f269 Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
Fixes https://github.com/VOREStation/VOREStation/issues/8387 that happened as a result of the janicart rewrite, and them no longer starting with buckets.

Polaris PR incoming ASAP.
2020-07-13 20:50:26 -04:00
Leshana
1e27088ca4 Merge pull request #8358 from VOREStation/upstream-merge-7268
[MIRROR] Ports Bay's lockers/cabinets/crates/etc
2020-07-13 14:38:47 -04:00
Atermonera
2444066b69 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-13 14:06:49 -04:00
Unknown
0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -04:00
Novacat
23967ce999 Merge pull request #8379 from VOREStation/upstream-merge-7324
[MIRROR] Add a random mech spawner (Not mapped in yet)
2020-07-09 23:33:24 -04:00
Novacat
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls
BALL!
2020-07-09 20:08:21 -04:00
Kates
e4389f170c Add a random mech spawner (Not mapped in yet) 2020-07-09 18:13:36 -04:00