Verkister
82b08a5266
Earlyports table/bench fix
...
Polaris being slow
2020-07-25 11:27:29 +03: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
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
Cerebulon
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
Rykka
2791419c98
Add Grill to Sorting List, Sort List by Appliance
2020-07-23 23:43:41 -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
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
Shadow-Quill
29173ed58a
Pressing Q now properly updates borg modules ( #7357 )
...
* Press Q to refresh borg modules
* No usr for you
2020-07-23 01:40:41 -04:00
Rykka
21f64e40fd
Merge branch 'master' into shep-dev-aurora-cooking
2020-07-22 23:25:41 -04:00
Rykka
886ab72289
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:34:13 -04:00
Novacat
c024b515de
Merge pull request #8441 from VOREStation/upstream-merge-7342
...
[MIRROR] Flavour Enhancement: Crates
2020-07-22 18:25:03 -04:00
Novacat
cdeb6b73cc
Update supply.dm
2020-07-22 18:02:16 -04:00
Unknown
382e676ee2
Compatability fixes
2020-07-22 17:37:47 -04:00
Verkister
4430c4eed4
Fixes panther rest icon not being used
2020-07-22 17:01:07 +03:00
Novacat
66c5b9124b
Merge pull request #8450 from VOREStation/upstream-merge-7359
...
[MIRROR] Clothes! (And rats)
2020-07-22 09:13:47 -04:00
Novacat
65e337dcdc
Merge pull request #8448 from VOREStation/upstream-merge-7355
...
[MIRROR] Reduces spam from new event system.
2020-07-22 09:13:17 -04:00
Novacat
cced5b4730
Merge pull request #8447 from VOREStation/upstream-merge-7343
...
[MIRROR] Allow you to only select mech weapons when cycling.
2020-07-22 09:12:59 -04:00
Novacat
254b318332
Merge pull request #8446 from VOREStation/upstream-merge-7351
...
[MIRROR] Removes superfluous punctuation
2020-07-22 09:12:41 -04:00
Schnayy
4cf5f95991
Clothes! (And rats)
2020-07-22 06:13:29 -04:00
Neerti
2aaca96081
Reduces spam from new event system. ( #7355 )
2020-07-22 06:04:38 -04:00
Kates
d4b3faaa4b
Allow you to only select mech weapons when cycling. ( #7343 )
...
If you desire.
2020-07-22 06:03:22 -04:00
Cyantime
8b925992b2
Removes superfluous punctuation ( #7351 )
2020-07-22 06:03:05 -04:00
cadyn
dc5ddb7d01
Added options to shapeshifter verbs for gradients ( #7348 )
2020-07-22 06:01:47 -04:00
ShadowLarkens
7453f64833
Adjusted some colors to make it more legible, added alien multitool magic
2020-07-22 01:03:00 -07:00
ShadowLarkens
3ea0e50432
Port TGUI Wire datums ( ParadiseSS13/Paradise#13769 )
2020-07-22 00:23:58 -07:00
Rykka
1ca8336bad
Change to_world debug messages to runtimes instead
2020-07-22 01:49:16 -04:00
SweetBlueSylveon
f75700468d
Service block patch.
...
Reverts changes to clowns and mimes, takes away their spawns, and removes the "commedian" and "performer" alt titles, as these are things that pertain more to the entertainment jobs.
Fixes a typo in the xenobot job description.
Changes a capital E to a lowercase e.
2020-07-21 20:35:10 -07:00
Novacat
77d6c2b33e
Update largecrate.dm
2020-07-21 22:31:40 -04:00
Cerebulon
4a87460ba8
Flavour Enhancement: Crates
2020-07-21 22:20:30 -04:00
Rykka
839b9bb4c8
Makes the Oven start closed. Recipe updates will come in a second PR
2020-07-21 19:21:51 -04:00
SweetBlueSylveon
6d1f286e46
Whitelist job and s3 tweak.
...
Gives clowns and mimes access to the backroom of entertainment like the rest of the entertainers. And gives the secret poker room tintable windows, and the service hall windows.
2020-07-21 16:20:07 -07:00
Novacat
8019c35d79
Merge pull request #8377 from lbnesquik/Kot-Smell-stuff
...
Add a smell system, closely matching the flavor system.
2020-07-21 18:14:01 -04:00
Novacat
8b7d087259
Merge pull request #8437 from Tenryumi/dragon-stuff
...
Adds dragon-y language and "*gao" emote
2020-07-21 18:12:43 -04:00
Novacat
453fb2c708
Merge pull request #8432 from cadyn/custom-temp-resistance
...
Added more custom species traits for temperature resistance
2020-07-21 18:11:58 -04:00
Novacat
709d926e33
Merge pull request #8422 from ShadowLarkens/tgui
...
TGUI-V4 w/ Camera Console
2020-07-21 18:09:40 -04:00
Cadyn
ca7092c80c
Minor grammar changes
2020-07-21 14:48:50 -07:00
Rykka
8d12b9f122
AI Restore Console Ported
2020-07-21 04:02:13 -04:00
Rykka
93a4631005
Various fixes and bugfixes from live playtests
2020-07-20 23:33:30 -04:00
Cadyn
fac86ebbd5
Combined opposite resistance and prone traits into nuetral adaptation traits and removed blooded traits.
2020-07-20 15:45:09 -07:00
Amy
ebaa88764d
Brightens D'Rudak'Ar language color
2020-07-20 16:02:39 -05:00
Novacat
d27f46492e
Merge pull request #8436 from Rykka-Stormheart/shep-dev-medbot-tipping
...
Port Medibot Tipping!
2020-07-20 12:56:37 -04:00
