Commit Graph

8573 Commits

Author SHA1 Message Date
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
Schnayy 99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
Killian 9adf026d61 Update maintenance.dm 2020-07-09 04:43:32 +01:00
Killian 721b456eea renamed them balls 2020-07-08 22:30:12 +01:00
Killian 0081e02688 Update balls.dm 2020-07-07 20:33:15 +01:00
Killian 0ee78b5da3 balls: loot & vending 2020-07-04 22:50:14 +01:00
Killian 68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00
Novacat 2ae8cb3b9d Merge pull request #8331 from lbnesquik/Kot-Explorer-Shield
Make the explorer shield light slightly brighter
2020-06-28 12:52:11 -04:00
Novacat c12b655f68 Merge pull request #8339 from VOREStation/upstream-merge-7304
[MIRROR] Offload Defibrillatability from NO_SCAN
2020-06-28 12:50:32 -04:00
Novacat 14803e6b99 Merge pull request #8343 from SweetBlueSylveon/Removes-Sam-Poster
Removes Sam Poster
2020-06-28 12:49:17 -04:00
SweetBlueSylveon 9e30fb2009 Removes Kisuke Poster
Fremoves /datum/poster/vore_10
2020-06-27 08:49:17 -07:00
SweetBlueSylveon 07867e07c7 Removes Sam Poster
Removes /datum/poster/vore_7.
2020-06-27 01:47:15 -07:00
Atermonera 5fbc4f3189 Merge pull request #7304 from KillianKirilenko/kk-bio
Offload Defibrillatability from NO_SCAN
2020-06-25 15:44:49 -04:00
Atermonera c5bca5d257 Merge pull request #7303 from BillyBangles/deep-blue-can-suck-my-toe
Adds chess pieces and chessboard holodeck program
2020-06-25 15:43:34 -04:00
lbnesquik b0435a32d5 Make the shield slightly brighter to reflect the gigantic bar on the front. 2020-06-24 06:05:52 +02:00
Novacat f7cab660e8 Merge pull request #8321 from VOREStation/upstream-merge-7297
[MIRROR] Wrist-bound PDAs!
2020-06-22 09:39:41 -04:00
Atermonera 90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
Verkister e1db52ccb1 un-earrapifies instruments (upstream early access)
The default falloff value for sounds is 0.5 (lower means quieter).
There was only 3 things ingame with a sound falloff of a whole whopping 5 (10x)
These things were explosions, telepads, and instruments.
One had a volume of 25%, another one had a volume based on distance threshold, and you can probably guess which one of the bunch had a hardcoded 100% volume.
2020-06-21 01:01:59 +03:00
Aronai Sieyes e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00