Commit Graph

106 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
Aronai Sieyes
3648722d96 Map changes for closets 2020-05-31 12:49:29 -04:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269)
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
2019-07-09 14:01:53 -04:00
Anewbe
13ccd7533f Removes Resident from the Southern Cross 2019-04-27 21:05:10 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Anewbe
f0db332943 Remplace sprite hammer with pickaxe 2018-10-09 16:28:45 -04:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Serithi
6837fb4796 Transfer shuttle grammar fixes 2018-08-17 19:14:02 -07:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Atermonera
cc4240f290 Keeps NS up to date 2018-08-03 14:03:49 -07:00
Anewbe
d00fd5bae6 Makes the Northern Star still compile 2018-08-03 15:53:52 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Arokha Sieyes
f0779da58d Stage 2 tag removal 2018-04-18 17:37:41 -04:00
Arokha Sieyes
78134b2b29 Stage 1 tag removal 2018-04-18 17:33:22 -04:00
Billy Bangles
05d5d0f7f9 removes crayon boxes from map
you can still order them from cargo though, for all those hungry marines
out there.
2018-03-19 20:25:10 -04:00
Leshana
ba36595263 Consolidated digital t-valves type paths.
- Because mirroring is now *much* easier to setup than digital remote control, we reverse the order of inheritance to de-duplicate all the radio code from digital t-valves!
- This requires changing the following type paths:
    /obj/machinery/atmospherics/tvalve/mirrored/digital  -> /obj/machinery/atmospherics/tvalve/digital/mirrored
    /obj/machinery/atmospherics/tvalve/mirrored/digital/bypass -> /obj/machinery/atmospherics/tvalve/digital/mirrored/bypass
- Change made on all maps.

- We can eliminate any overriden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 15:11:55 -05:00
Neerti
d71a610a97 Adds Missing Ceiling Overlay + Fixes Space on Roof
On Multi-Z compatible maps, if a tile is missing a ceiling (IE there is an open space above it), it will display an overlay to show this. This makes it easier to know where the hole in the ceiling is without having to go to the ceiling. Overlay sprite by Mechoid.
Also fixes space tiles appearing when meteors/explosions/other fun things occur on the Southern Cross map instead of open space.
2018-01-22 14:27:19 -05:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Neerti
495f985022 Travis Appeasement Mark II (#4485)
* Tries to Please Travis
Should remove all active edge problems.
Moves map-specific unit tests to the map define file.
Enhances some PoIs in terms of adding /ignore_mapgen to the ground.
Fixes incorrect loot pile in one PoI.

* Conflicts are fun.

* Might fix unit test.
2018-01-01 22:26:31 -05:00
Woodratt
ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
mistyLuminescence
dc3424b526 Boxcutter and teapot 2017-12-04 12:59:07 +00:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Anewbe
fc2538d1c0 Merc and Heist shuttles should be able to cloak again. 2017-11-11 16:24:25 -06:00
Anewbe
b852558943 Merge pull request #4229 from mistyLuminescence/vaultgoodies
Adds gold and silver bars to the Vault
2017-11-10 10:58:39 -06:00
Anewbe
bd16cbb91d Merge pull request #4226 from mistyLuminescence/miningmaint
Fixes mining maint access.
2017-11-07 12:18:56 -06:00
mistyLuminescence
c58e2c1da2 Adds gold and silver bars to the Vault 2017-11-06 10:46:10 +00:00
mistyLuminescence
0f4027d11e Fixes mining maint access 2017-11-06 09:49:22 +00:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217)
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
Anewbe
1126523497 Merge pull request #4202 from mistyLuminescence/mappingstuff
Chemist and Psychiatrist locker fixes, for real this time.
2017-11-05 20:08:34 -06:00
Anewbe
25fddcd410 Merge pull request #4204 from mistyLuminescence/evamap
EVA changes
2017-11-05 18:40:58 -06:00
mistyLuminescence
85d105d90a Removes chem straightjacket, sorry chem! 2017-11-04 05:20:38 +00:00
mistyLuminescence
268156db3e Gives the CMO vials IT'S TWO TILES IF THE MAP MERGER BREAKS I WILL CRY 2017-11-04 00:09:33 +00:00
mistyLuminescence
b391573b94 FUCK THIS PR 2017-11-04 00:05:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
mistyLuminescence
1b715023c9 map memes 2017-11-03 20:26:25 +00:00
mistyLuminescence
ffc4a18aa7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into evamap 2017-11-03 20:18:06 +00:00
Anewbe
8ffbd64df2 Merge pull request #4200 from mistyLuminescence/lockerroomairalarm
Adds missing air alarm to locker room.
2017-11-02 16:57:24 -05:00
mistyLuminescence
8bfbe69b30 Remaps EVA to be more symmetrical. 2017-11-02 18:55:28 +00:00
mistyLuminescence
7ff81f2137 Adds missing air alarm to locker room. 2017-11-01 20:36:02 +00:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Anewbe
087bf9f425 Merge pull request #4099 from mistyLuminescence/mercbaseammofix
Fixes the merc base assault rifle ammo.
2017-10-18 16:27:29 -05:00
mistyLuminescence
c92dacaf02 Fixes the merc base assault rifle ammo. 2017-10-18 17:48:01 +01:00
killer653
92355362fe BEGONE
https://www.youtube.com/watch?v=AFCxHmtHTGU
2017-10-15 21:09:26 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00