53723 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SweetBlueSylveon	11b005115e	Kitchen patch (mostly) ... A moderate overhall to the kitchen to make it feel less overly spacious, while still keeping the extra walking room. Changes some shutter directions. Puts punpun in the backroom.	2020-07-26 16:55:56 -07:00
Novacat	344d5cb77a	Merge pull request #8486 from Rykka-Stormheart/shep-dev-nutri-spread ... Fix for Nutrispread not being available and Alternative Method for UE	2020-07-26 08:33:02 -04:00
Novacat	59321b2636	Merge pull request #8485 from VOREStation/upstream-merge-7375 ... [MIRROR] Fix scrubbers	2020-07-26 08:30:36 -04:00
Rykka	453715bfb3	Fix for Nutrispread not being available and Alternative Method for UE ... Allows you to get Universal Enzymes via the Biogenerator and Nutri-spread from the biogenerator. Re-color-codes the biogenerator menu.	2020-07-26 08:05:53 -04:00
Novacat	5701af8b95	Update medbot.dm	2020-07-26 01:58:53 -04:00
Atermonera	c1638aa7b8	Fix scrubbers	2020-07-26 01:57:38 -04:00
Novacat	c14a7ea7b1	Merge pull request #8483 from Rykka-Stormheart/shep-dev-batter-fix ... Fix batter and all subtypes of it being unmake-able.	2020-07-26 01:18:59 -04:00
Rykka	f18c8bfa0a	Fix batter and all subtypes of it being unmake-able. ... Add water or beer BEFORE adding egg + flour together to avoid messing it up.	2020-07-26 00:17:27 -04:00
Novacat	f61ee1ccc3	Merge pull request #8482 from Rykka-Stormheart/shep-dev-medbot-hotfix ... Medibot Interaction Hotfix	2020-07-26 00:12:48 -04:00
Rykka	84d9798802	Medibot Interaction Hotfix ... Always check that you're passing the arguments a proc needs. In this case, I was calling interact(), but not giving it a mob to interact with. Whoops.	2020-07-25 23:09:09 -04:00
Novacat	bce3263f25	Merge pull request #8477 from SweetBlueSylveon/service-patchey ... Final patch.	2020-07-25 21:45:23 -04:00
SweetBlueSylveon	4fe5b7a558	dmm2tgm	2020-07-25 13:07:40 -07:00
SweetBlueSylveon	c9e3131ac0	Sink in the bar	2020-07-25 12:42:59 -07:00
SweetBlueSylveon	4763e6042b	Final patch.	2020-07-25 12:24:35 -07:00
Novacat	e64b2a27cc	Merge pull request #8471 from ShadowLarkens/tgui_med ... Medical TGUI	2020-07-25 14:54:45 -04:00
Aronai Sieyes	6a79e6e409	Merge pull request #8475 from SweetBlueSylveon/service-patch-2 ... Another update for service.	2020-07-25 12:36:42 -04:00
SweetBlueSylveon	37d05f1db3	dmm2tgm	2020-07-25 08:46:18 -07:00
SweetBlueSylveon	5209b5f235	Another update for service. ... Adds some better phoron breach protection. Moves some stuff around in the kitchen.	2020-07-25 08:42:02 -07:00
Novacat	57b5a9cace	Merge pull request #8474 from SweetBlueSylveon/service-bock-fix ... Service Remap tweak	2020-07-25 11:18:13 -04:00
Novacat	36339e03fe	Merge pull request #8472 from VOREStation/Verkister-patch-1 ... Earlyports table/bench fix	2020-07-25 11:17:48 -04:00
SweetBlueSylveon	ee60a1b717	Fixes a large number of issues brought up. ... Fixes the roof for surface med. Adds lights. Changes the hallway disposals to a bin in the entertainment room. Gives clowns entertainment access. Fixes a pipe's visibility. Adds shutter and tint control buttons where they were missing. No the I'm not moving the goat he's my friend and he's staying in the freezer.	2020-07-25 05:23:15 -07:00
Verkister	82b08a5266	Earlyports table/bench fix ... Polaris being slow	2020-07-25 11:27:29 +03:00
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
Novacat	b36add6538	Merge pull request #8444 from ShadowLarkens/tgui_wires ... Port TGUI Wire datums & Colorblind Wires	2020-07-24 21:12:48 -04:00
Novacat	7d7daea7e2	Merge pull request #8468 from Rykka-Stormheart/shep-dev-cooking-table-emergency-fix ... PR to update kitchen so all appliances are useable	2020-07-24 21:12:28 -04:00
Rykka	7ece2ea02f	PR to update kitchen so all appliances are useable	2020-07-24 20:30:53 -04: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
Novacat	25445b41dc	Merge pull request #8465 from VOREStation/Verkister-patch-1 ... Earlyports melee exploit fix	2020-07-24 11:43:31 -04:00
Verkister	6f5c5ddf33	Earlyports melee exploit fix ... *incoherent groaning*	2020-07-24 18:26:19 +03:00
Novacat	61314af7a1	Merge pull request #8463 from Rykka-Stormheart/shep-dev-null-reagent-fix ... Null R.Type fix and Fortune Cookie Fix	2020-07-24 11:17:43 -04:00
Rykka	04024ad472	Null R.Type fix and Fortune Cookie Fix ... Fortune Cookies had special weird-as-shit code to handle leaving a piece of paper behind, and therefore just getting rid of the special-code seems the best option. R.type is actually R.id on our codebase, so that was causing runtimes. This fixes those runtimes. Also removes duplicate recipes from microwave.dm, and fixes the issue with recipes returning burnt mess.	2020-07-24 10:05:39 -04:00
Novacat	8428de3dd4	Merge pull request #8461 from VOREStation/upstream-merge-7337 ... [MIRROR] Persistent Trash/Dirt/Graffiti/Notices	2020-07-24 09:22:33 -04:00
Novacat	5c120cd547	Merge pull request #8408 from VOREStation/upstream-merge-7334 ... [MIRROR] Reorganized Library Computer Menu	2020-07-24 09:09:00 -04:00
Unknown	c4476fc51c	Why is this still here	2020-07-24 09:08:18 -04:00
Unknown	5d7afad7c3	Conflict Resolution	2020-07-24 09:07:41 -04:00
Novacat	0e2e0db5cb	Update lib_machines.dm	2020-07-24 08:55:11 -04:00
Novacat	a940d19a13	Update material_recipes.dm	2020-07-24 08:43:34 -04:00
Novacat	6321f2dc50	Update vorestation.dme	2020-07-24 08:37:58 -04:00
Cerebulon	8b031dd8ad	Persistent Trash/Dirt/Graffiti/Notices	2020-07-24 05:24:56 -04:00
Novacat	79de2902ba	Merge pull request #8460 from Rykka-Stormheart/shep-dev-recipe-dump-sorting ... Add Grill to Sorting List, Sort List by Appliance	2020-07-24 00:07:51 -04:00
Rykka	2791419c98	Add Grill to Sorting List, Sort List by Appliance	2020-07-23 23:43:41 -04:00
Novacat	8b76539f82	Merge pull request #8459 from Rykka-Stormheart/shep-dev-recipe_dump-fix ... Aurora Cooking Recipe Dump Fix and Peanut Oil Fix	2020-07-23 22:42:44 -04:00
Rykka	2b8b58433c	Aurora Cooking Recipe Fixes ... Includes runtime fixes to recipe dump - now if a reagent is invalid, it will skip that item and runtime it so you can identify why. Re-adds Peanut Oil and hotspot math for oil spills.	2020-07-23 22:13:43 -04:00
Novacat	396255a9ad	Merge pull request #8419 from SweetBlueSylveon/Tether-Tweak ... Service Block Redone	2020-07-23 14:22:31 -04:00
Novacat	ab7eb814b6	Merge pull request #8456 from VOREStation/Verkister-patch-1 ... Fixes mob spawner atmos weirdness.	2020-07-23 08:12:11 -04:00
Verkister	81e3d6f598	Fixes mob spawner atmos weirdness. ... - Fixes submap mob spawners setting atmos requirements on mobs that aren't supposed to have atmos requirements. - Also makes the spawners only tweak the temperature requirements if environment temperature is outside the mob's own healthy temperature range.	2020-07-23 14:31:06 +03:00
Rykka	c14f68f4bd	Correct Filepaths	2020-07-23 04:14:20 -04:00
Rykka	c1a5aee641	Merge branch 'master' into Tether-Tweak	2020-07-23 04:08:25 -04:00
Novacat	47b31301e8	Merge pull request #8413 from Rykka-Stormheart/shep-dev-aurora-cooking ... Aurora Cooking Port	2020-07-23 02:53:46 -04:00
Novacat	de6e7b4160	Merge pull request #8455 from VOREStation/upstream-merge-7357 ... [MIRROR] Pressing Q now properly updates borg modules	2020-07-23 02:48:57 -04:00