a52fd76249
Fixfix
2020-07-30 15:35:54 -04:00
a5121d9ff0
Fixes missing Vox Pidgin, hopefully
2020-07-30 15:28:41 -04:00
9578296ca5
Merge pull request #8535 from VOREStation/upstream-merge-7352
...
[MIRROR] Increase mob default reload time from 1 second to 4 seconds.
2020-07-30 15:03:12 -04:00
216a8d8c12
Merge pull request #8533 from VOREStation/upstream-merge-7345
...
[MIRROR] custom_sprites.dm small improvement and better commenting.
2020-07-30 14:53:48 -04:00
38e4cbd3e9
Merge pull request #8532 from Cyantime/patch-2
...
Allows some protean ventcrawl accessories
2020-07-30 14:53:25 -04:00
f63d2c4506
Merge pull request #7352 from lbnesquik/Kot-Mob-Tweak
...
Increase mob default reload time from 1 second to 4 seconds.
2020-07-30 14:46:19 -04:00
cb31910225
Merge pull request #7345 from LunarFleet/Lun-Sprite
...
custom_sprites.dm small improvement and better commenting.
2020-07-30 14:41:39 -04:00
c81eae8191
Merge pull request #8531 from lbnesquik/Kot-Stuff-Cyborg
...
Add a little message for once you are done refilling some water as a dogborg.
2020-07-30 14:33:17 -04:00
120483c41c
Allows some protean ventcrawl accessories
2020-07-30 14:30:58 -04:00
e962474fc5
Add a little message for once you are done refilling some water as a dogborg.
2020-07-30 19:41:18 +02:00
744fb20b4a
Fixes some trait stats requiring set_species
...
Moves a couple trait stats applied via set_species proc to somewhere custom species can actually access them.
Mostly just affects motion based hunger factor, and would also affect health traits but those already have their own bandaid application.
2020-07-30 11:28:02 +03:00
bf842ed57a
cleanup crew deployment authorized
2020-07-30 05:27:58 +01:00
7f2952bd90
Fix medhuds/sechuds and stuff showing on the camera monitor improperly
2020-07-29 19:03:33 -07:00
4f2f60e4bc
vr file makes more sense also added comment separator
2020-07-29 22:03:05 +01:00
438c1e600b
adds cool and good new drink recipe
2020-07-29 21:33:08 +01:00
ca022164bb
Merge pull request #8520 from TeleTubby2/MlemWax
...
Makes sterilizine actually useful.
2020-07-29 15:09:07 -04:00
3a367e20fb
More reasonable value.
...
200 steps to see dirt again is a bit excessive.
2020-07-29 15:07:00 -03:00
dd52bc19af
Merge pull request #8515 from Rykka-Stormheart/shep-dev-flat-dough
...
Fix for flatbread/tortilla recipe conflict, and missing trash icons
2020-07-29 06:58:14 -04:00
9f8123cbb7
Make sleever error messages more consistent and obvious
2020-07-28 17:58:54 -07:00
bd5d102a35
Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict
2020-07-28 12:07:16 -04:00
a34bb589d1
Massive Map/Bugfix
2020-07-28 10:33:56 -04:00
c4f7aed7f4
Merge pull request #8215 from dwinters99/spellcheck
...
Minor typo fixes
2020-07-27 01:55:24 -04:00
9e72efca03
Update clothing.dm
2020-07-27 01:43:56 -04:00
2834a0b9c6
Correct a typo with the smelling ability.
2020-07-27 05:27:06 +02:00
15da4a522f
Rename Alcoholic Version of Love Potion to The Love Maker
...
Should prevent the alcoholic version of Love Potion appearing fucking everywhere.
2020-07-26 20:29:10 -04:00
5eefadf78b
Update netgun design name
2020-07-26 17:06:57 -04:00
5701af8b95
Update medbot.dm
2020-07-26 01:58:53 -04:00
c1638aa7b8
Fix scrubbers
2020-07-26 01:57:38 -04:00
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
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
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
63b9a13124
Makes sterilizine actually do something worthwhile.
...
Hnnnnnnng. if floor code wasn't ass I'd give this it's own overlay, but it's fine. probably. the reason I'm not throwing this at Polaris is because I can't be assed forking them with my junky, canadian internet.
2020-07-25 21:42:49 -03:00
e64b2a27cc
Merge pull request #8471 from ShadowLarkens/tgui_med
...
Medical TGUI
2020-07-25 14:54:45 -04:00
82b08a5266
Earlyports table/bench fix
...
Polaris being slow
2020-07-25 11:27:29 +03:00
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
c2618c0e66
Merge remote-tracking branch 'upstream/master' into tgui_wires
...
# Conflicts:
# code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
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
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
8428de3dd4
Merge pull request #8461 from VOREStation/upstream-merge-7337
...
[MIRROR] Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 09:22:33 -04:00
5c120cd547
Merge pull request #8408 from VOREStation/upstream-merge-7334
...
[MIRROR] Reorganized Library Computer Menu
2020-07-24 09:09:00 -04:00
5d7afad7c3
Conflict Resolution
2020-07-24 09:07:41 -04:00
0e2e0db5cb
Update lib_machines.dm
2020-07-24 08:55:11 -04:00
a940d19a13
Update material_recipes.dm
2020-07-24 08:43:34 -04:00
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
2791419c98
Add Grill to Sorting List, Sort List by Appliance
2020-07-23 23:43:41 -04:00
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
47b31301e8
Merge pull request #8413 from Rykka-Stormheart/shep-dev-aurora-cooking
...
Aurora Cooking Port
2020-07-23 02:53:46 -04:00
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
21f64e40fd
Merge branch 'master' into shep-dev-aurora-cooking
2020-07-22 23:25:41 -04:00
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
Unknown