Commit Graph

316 Commits

Author SHA1 Message Date
Rykka
ecfe23398b Makes Changes requested by maintainer 2020-07-30 04:59:01 -04:00
Rykka
a774790053 Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict 2020-07-28 12:09:31 -04:00
Rykka
ac18155d40 Null R.Type fix and Fortune Cookie Fix
Upstream port of https://github.com/VOREStation/VOREStation/pull/8463
2020-07-24 10:13:27 -04:00
Rykka
24f754f558 Fix Recipe Dump + Reagents, reduce # of commits by 1 2020-07-23 23:46:27 -04:00
Rykka
b367193908 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:45:03 -04:00
Rykka
b5b5298250 Change to_world debug messages to runtimes instead 2020-07-22 01:55:26 -04:00
Rykka
92650867eb Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 20:23:33 -04:00
Rykka
aae41604d7 Clean up commit history, bugfixes, etc. 2020-07-20 23:47:36 -04:00
Rykka
2b8f7ccaad Add text2list, remove Virgo Recipes, Gets it to pass compile 2020-07-16 21:17:56 -04:00
Rykka
7c37997619 Aurora Commit 3 2020-07-16 20:55:23 -04:00
Rykka
aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
Rykka
74cde3b15b Aurora Cooking Port Commit 1 2020-07-16 20:50:11 -04:00
Arokha Sieyes
723d2afcec Allow reagents to have specific metaglass icon files 2020-05-30 16:59:09 -04:00
Aronai Sieyes
ad75bb86bd Alter playsound paradigm 2020-05-19 11:06:28 -04:00
Atermonera
270ad65e33 Merge pull request #7094 from VOREStation/pol-shakername
Fix protein shaker name
2020-05-06 23:05:57 -07:00
Atermonera
9c40e88aae Merge pull request #7093 from VOREStation/pol-cond
Fix condiment container infinite range
2020-05-06 23:04:11 -07:00
Aronai Sieyes
b7aae34335 Merge branch 'master' into pol-defaultparts 2020-05-05 22:51:02 -04:00
Aronai Sieyes
f3a1f6a894 Fix protein shaker name 2020-05-04 21:01:29 -04:00
Aronai Sieyes
7e1714256d Fix condiment container infinite range 2020-05-04 20:59:57 -04:00
Atermonera
61c4929d61 Merge pull request #7045 from Neerti/let_them_eat_all_the_cake
Removes limits on eating, centralizes nutrition changing.
2020-04-29 14:14:11 -07:00
Aronai Sieyes
6c6644f86c Rewrite examine() to pass a list around (#7038) 2020-04-29 13:42:16 -07:00
Aronai Sieyes
b3e9960029 Move machines to use default_apply_parts() 2020-04-27 11:57:43 -04:00
Neerti
2dee403370 Removes limits on eating, centralizes nutrition changing. 2020-04-26 05:30:32 -04:00
Atermonera
3473522d5a Merge pull request #6904 from VOREStation/pol-cleanup
Clean up various things
2020-04-03 00:13:32 -07:00
Atermonera
636062b506 Merge pull request #6858 from VOREStation/pol-bayvend
Port Bay's vendor/smartfridge sprites
2020-03-30 17:43:48 -07:00
Aronai Sieyes
715de43f35 VChat: Redone chat output done in Vue.js (#6761)
* Better notifications

* Add buttons to del/move tabs in edit mode

* Add a <span> to emotes

* Fix duplicate IDs in VChat and add more logging

* VChat: Redone chat output in Vue.js

* Ported tg asset cache

* VChat DME Update

* Replace \image macro with bicon()

* NanoUI Subsystem Fixes

Don't do this, the asset subsystem does this for you

* Allow narrate/globalnarrate shenanigans

Allows HTML if your entire thing is HTML

* Disable bicon() icon object cache, and create text tag cache

* Ore Scanner is written incorrectly

Only revealed by vchat

* Fixes 2 VChat bugs

* Underline links in VChat

* Fix LOOC color

* VChat Improvements

Hopefully, anyway.
- Arbitrary font size setting
- Line height setting
- Multiple crush settings
- Rewrote how tabs work hopefully for performance
- Hidden messages are actually put elsewhere
- Attempts to correct chat backlog restore on rejoin

* Surgery steps to use <span>

* Some VChat Tweaks

- Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working)
- The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes.
- Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s.

* Include date in filename for VChat log save

* Merge pull request #6767 from Cyantime/patch-2

Change chat export naming scheme

* Adds VChat tab saving

Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc.

* Fix chat exporting when someone has used unicode

Only affects clients still using 512

* Use CLIENT_FROM_VAR for ease of code reading

* Update code/modules/client/asset_cache.dm

Co-Authored-By: Novacat <35587478+Novacat@users.noreply.github.com>

* Fix runtime when client disconnects before vchat loads

* Fix polaris version of command reports

* Fix LOOC color in oldchat

* Put some styles in various adminpm messages

* Round info and advanced who spans

* Fix missing tag-end

* Maybe fix images for linux and statpanel but also doom everyone

Co-authored-by: ShadowLarkens <ShadowLarkens@users.noreply.github.com>
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
2020-03-27 14:07:28 -07:00
Aronai Sieyes
ad5f0485f7 Clean up things 2020-03-25 22:10:56 -04:00
Leshana
938384cb1b In fact lets use the constants instead of bare numbers for use_power everywhere. 2020-03-21 19:41:01 -04:00
Aronai Sieyes
df8c2da6c4 Port Bay's vendor/smartfridge sprites
They have directions!
2020-03-16 20:28:56 -04:00
Atermonera
22e28f29fe Merge pull request #6804 from Cerebulon/bigsounds
Big Bastard Incidental Sound Port
2020-03-15 11:38:44 -07:00
Atermonera
3314d865bd Merge pull request #6811 from Schnayy/mwsprites
Deluxe microwave sprites work
2020-03-12 00:20:41 -07:00
Cerebulon
2670a1c0e4 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 17:30:42 -07:00
Schnayy
d5dc6337cb Sprites work now 2020-03-10 14:43:36 -05:00
Schnayy
1d565808b3 fix and changelog 2020-03-10 13:39:32 -05:00
Cerebulon
52e6669bf9 Big Bastard Incidental Sound Port 2020-03-08 23:25:45 +00:00
Schnayy
4cdb795be1 fixes an oopsie 2020-03-08 16:38:03 -05:00
Schnayy
e81f95e61f Fixes names appearing in vendors properly. 2020-03-08 16:31:44 -05:00
Schnayy
4b2a0cc6cf Many small changes. 2020-03-08 10:16:17 -05:00
Schnayy
5f33c40356 Let them finally eat cake (#6778)
* whyyyy

* messily keeps poisonberries a berry alternative
2020-03-03 12:56:34 -08:00
Schnayy
5c1c7cffe8 Sprite fixes 2020-03-01 04:01:29 -06:00
Neerti
aeaa5856c0 Changes recipe. 2020-02-24 18:38:37 -05:00
Atermonera
acaa4d4f8d Merge pull request #6717 from LeighKnapenberger/master
Fixes Mint Apple Sparkle having a recipe, but no drink
2020-02-24 12:59:59 -08:00
Anon
689f238a80 Merge remote-tracking branch 'origin/master' 2020-02-20 19:09:04 -05:00
Cerebulon
f801cc95be Allows precision placement of most items 2020-02-19 21:16:26 +00:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
Heroman3003
a78e3c92e0 Adds pineapple pizzabox (#6682) 2020-02-13 14:10:53 -08:00
Atermonera
a47090f490 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas
Metamorphic Pint Glass
2020-02-12 21:30:32 -08:00
LeighKnapenberger
d53490639d Fixes Mint Apple Sparkle having a recipe, but no drink 2020-02-10 22:54:16 -05:00
Woodratt
512fe09064 2020 Civilian Overhaul
- Added sofas (no options to build one in round yet, will be added after this pull).
- Add neonsigns, currently one neon sign, Cafe. (Code is copy pasta from holosigns).
- Add boxes with mugs and cups.
- Neon signs and holosigns now emit light while on.
- Merged the Coffee Shop with the Library.
- Moved the Locker Room to where the Coffee Shop was, adjusted the holodeck.
- Old Locker Room turned into a construction area.
- Adjusted holodeck maps to new orientation.
- Changed sprite of barcode scanner.
- Cleaned up furniture icon dmi, fixed arm rest icons for shuttle chairs.
2020-02-02 23:58:26 -08:00
Nadyr
26b5e7aedb -Adds a metamorphic pint glass
-Adds said glass to the booze-o-mat
-Adds the icon for said glass
-Fixes metaglass icons for mojito and goldschlager
2020-01-28 23:33:22 -05:00