Commit Graph

550 Commits

Author SHA1 Message Date
ShadowLarkens 2579579fd1 TGUI'ified Medical Everything
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
2020-07-25 00:44:51 -07:00
Unknown 5d7afad7c3 Conflict Resolution 2020-07-24 09:07:41 -04:00
Rykka 21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04: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
ShadowLarkens 2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
ShadowLarkens a20eef5bfb TGUI Camera Console - Part 1; Plain console done
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
2020-07-16 16:17:36 -07:00
ShadowLarkens 1cded01770 TGUI v3.0
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
2020-07-16 14:59:45 -07: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
Atermonera 736fdab6e3 Merge pull request #7273 from Cyantime/obs
Observing improvements
2020-06-24 11:36:18 -04:00
Atermonera 90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
Aronai Sieyes 719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes 6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes 49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
Aronai Sieyes 61ae4f886c Shapeshifter color selection knows default/current 2020-05-21 11:59:54 -04:00
Aronai Sieyes 48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes 0adea12715 Optimize mob finding in radio ranges 2020-05-18 11:17:39 -04:00
Aronai Sieyes 190e8bdd5a Try to ensure some mobs don't end up processing in SSmobs 2020-05-17 09:40:39 -04:00
Aronai Sieyes 0d14487cdc Add serial comma 2020-05-16 17:06:21 -04:00
Arokha Sieyes a77da3b5df Clean up merge conflicts 2020-05-14 09:44:52 -04:00
Atermonera 21620a1814 Add UAVs 2020-05-14 00:34:29 -04:00
Aronai Sieyes d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Arokha Sieyes 6d47c2f95c Further time fixes 2020-05-08 10:09:40 -04:00
Arokha Sieyes 323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Aronai Sieyes ae303cd122 Merge pull request #7676 from VOREStation/aro-bicon2
Refactor examining and some of getFlatIcon
2020-05-06 23:21:41 -04:00
Aronai Sieyes 939105952a "Deg" instead of symbol 2020-05-06 23:11:29 -04:00
Aronai Sieyes 9acf643828 Make DS2NEARESTTICK macro 2020-05-06 20:26:51 -04:00
Aronai Sieyes bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -04:00
Aronai Sieyes d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
Aronai Sieyes 0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
ShadowLarkens dc61ee2ffe Vore Datums implemented, awaiting integration&testing 2020-04-30 16:37:41 -07:00
Unknown 49570f0d24 New Lore Oversights
- Loads banners_vr
- Properly sets time back to 2320
2020-04-30 09:11:08 -04:00
Aronai Sieyes fb87fbe2d7 VS: Add UAV 2020-04-28 23:18:27 -04:00
Aronai Sieyes 0c2f8cedb5 Add UAV, UAV software
Design placed in mechfab
2020-04-28 23:18:08 -04:00
Atermonera 7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
Leshana 3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Aronai Sieyes 0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2
ITV Talon offmap spawn jobs
2020-04-13 09:28:19 -04:00
Leshana 262faa38e4 Replace global all_areas list with world.
It ends up having similar performance, so might as well not bother with all_areas.
2020-04-12 18:04:54 -04:00
Aronai Sieyes e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Leshana d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System"
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
2020-04-06 17:31:26 -04:00
Atermonera 5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Atermonera f8005fda4b Merge pull request #6941 from spookydonut/parsefixes
Fix some parse errors
2020-04-05 02:33:28 -04:00
Aronai Sieyes 58dc70861c Update unsorted.dm 2020-04-03 12:23:21 -04:00
Atermonera d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Aronai Sieyes 0d043fe44e Update assemblies to modern coding standards 2020-03-30 22:18:44 -04:00
Leshana 2e114ede5c Fix error handler printing bogus src.loc and usr.loc info 2020-03-30 20:30:36 -04:00
Aronai Sieyes edd91313a8 Slow your roll, turrets 2020-03-30 12:03:39 -04:00
Aronai Sieyes 7cb680ab34 Merge pull request #6918 from VOREStation/upstream-merge-6826
[MIRROR] Port Landmark Shuttles
2020-03-21 00:52:08 -04:00
Leshana 41aa31f847 Refactor carp event to optionally use landmarks if present and stop at the edge of space. 2020-03-19 20:29:43 -04:00
Leshana f2a582569b Ports overmap events from Baystation12
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
2020-03-19 20:29:43 -04:00
Leshana cf7d50978e Fix list_values to support lists of lists. Fix missing variable init. 2020-03-19 20:28:53 -04:00