Commit Graph

31 Commits

Author SHA1 Message Date
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -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
Killian
5e1a0f28d9 Update ert.dmm 2020-06-19 04:43:25 +01:00
Killian
6d27dd42f9 Update ert.dmm 2020-06-19 04:36:19 +01:00
Killian
039928ab72 ert suits and cleanup 2020-06-19 04:35:30 +01:00
Aronai Sieyes
cac3fbccff VS: Map changes for closets 2020-05-31 12:49:58 -04:00
Amaya
504696fcb1 Adds more areas to fun.dm 2020-05-29 17:51:06 +02:00
Aronai Sieyes
f235311fd8 Merge branch 'master' into aro-admemes 2020-04-24 21:07:31 -04:00
Amaya
b22fb6a6ac adds 6 more admin_upload areas 2020-04-24 16:00:02 +02:00
Aronai Sieyes
4d54812264 Add various admin-uploaded-map helpers 2020-04-23 21:57:02 -04:00
Aronai Sieyes
bdc75e654f Adds 2 new bedsheets 2020-04-18 23:16:00 -04:00
Aronai Sieyes
8b629e339d Fixes trader shuttle access
It was a mess of 150 and 160, should be 160.

Fixes #7182
2020-04-13 16:01:39 -04:00
Unknown
f230f43ad9 Adds weapon power cells to ERT 2020-04-09 21:02:48 -04:00
Unknown
d277f37182 Readds missing medical kits to ERT 2020-03-29 02:58:50 -04:00
Unknown
3da84a477b Some Adminbus Fixes
- Fixes Cruiser not having scrubbers/vents mapped in to some areas
- Reconfigures Cruiser fighterbay, has 8 fighters now.
- Fixes path issue for Cruiser and KHI vessels
- Moves ERT Relays to the Centcomm map
2020-03-24 16:29:54 -04:00
Unknown
6905716d36 Updates NT Cruiser
- Adds functional turrets
- Removes redundant, unused file
- Adds engines, flight consoles, etc.
- Adds functional airlocks
2020-03-18 16:51:29 -04:00
Aronai Sieyes
4ad035b16d Move most antag things to admin-loadable maps 2020-03-18 01:27:29 -04:00
Unknown
84406fdef2 Centcom Consolidation
- Moves Centcom to tether_misc, stubs it
- Moves a copy of the old Centcom to dhael_centcom.dmm for adminload purposes
- Adds a new ERT Shuttle, where the ERT will spawn at. Currently not an overmap shuttle.
- Consolidates tether_areas and tether_areas2 into the same file
2020-03-15 13:02:33 -04:00
Aronai Sieyes
2e4b15c733 Update smoller admin ship 2020-03-13 10:05:37 -04:00
Arokha Sieyes
0cb233514a Replace IV Drips with medical stands 2020-02-22 00:51:49 -05:00
Unknown
4087263c20 Centcom/Tether Ship Changes
- Centcom arrivals changed to south, instead of west.
- Removed outdoor areas from Centcom
- Moved Aronai and Joan's houseboat to admin_use

The goal here was to open up some space at the CentCom Z level for future things down the line, which is why the CC Z level now has a 140x50 chunk of empty space.

In the future (either in this PR, or a future PR) I will be readding an admin ship to the Centcom Z level in that empty space that will functionally serve as the replacement for the old houseboat, as well as using that Z level for other projects.
2019-11-22 12:15:49 -05:00
Soft
6db9e66d5e Puts the new admin upload areas under the admin upload area
Just for tidying up the list, since it might not have been too obvious what AU2-6 were when not under the appropriate listing.
2019-10-20 03:39:42 -04:00
Soft
7e963781a2 REE INDENT 2019-09-26 17:26:17 -04:00
Soft
a6def53ece Adds extra admin upload areas
What it says on the tin. For making uploadable maps with multiple different areas that need power and respect lighting.
2019-09-26 17:23:19 -04:00
Heroman3003
52d66bd205 Fixes foxes on spa map? 2019-04-02 09:51:47 +10:00
Poojawa
d79344e634 Update spa.dmm 2019-02-02 08:13:42 -06:00
Poojawa
a9d025b1f0 Shifts vore mobs to proper locations, cleans loose folder
also attempts a Travis complaint fix The command "awk -f tools/indentation.awk **/*.dm" exited with 1.
2019-02-02 08:07:20 -06:00
Poojawa
ed3c638761 WEW LAD MERGE CONFLICTS IN MAPS 2019-02-02 05:53:26 -06:00
Very-Soft
af33eff3f5 updates admin upload areas to not always be powered 2018-10-13 02:51:29 -04:00
Spades
02f0eda793 Fixed spa.dmm 2018-04-29 07:54:16 -04:00
Arokha Sieyes
86b087bee0 Add adminload Spa map, tweaks
Add a Spa map, mostly to use for events. Tweak teleporter to work better with adminloaded templates and things like that.
2018-02-21 21:58:00 -05:00