Commit Graph

53542 Commits

Author SHA1 Message Date
Rykka
839b9bb4c8 Makes the Oven start closed. Recipe updates will come in a second PR 2020-07-21 19:21:51 -04:00
Rykka
93a4631005 Various fixes and bugfixes from live playtests 2020-07-20 23:33:30 -04:00
Rykka
df7bb084f1 Bugfixes, Feature Tweaks, and Final Touches
Microwave not cooking micros/mice: Fixed
Invalid Recipe datum thanks to /microwave prefix: Fixed
Fryer earsplittingly loud: Fixed
Fryer/Oven continuing to cook even after items removed: Fixed
Oven having 'on' icon state when door closed but off: Fixed
Appliances not scaling cooking time/damage based on size: Fixed
Feature added - Burning Food will set off fire alarms and set off a black cloud of smoke!
Overcook time reduced to allow for less margin of error (IE Actively requires you to pay attention)
Multiple Microwave bugfixes, including multicooking/etc not working, recipe errors, icon state errors, ejection errors.
2020-07-17 23:58:33 -04:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
Rykka
9f935ff59d Second Half of Aurora Cooking Initial Port - All files added
Now onto the bugfixing nightmares!
2020-07-16 00:37:22 -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
Novacat
863e7fdb8b Merge pull request #8410 from Cyantime/talonblastdoors
Fix talon bridge blast door areas
2020-07-14 08:56:22 -04:00
Novacat
94596abe76 Merge pull request #8407 from VOREStation/upstream-merge-7333
[MIRROR] Flavour Enhancement: Guns
2020-07-14 08:35:48 -04:00
Cyantime
12b77f3d9e Fix talon blast door areas 2020-07-14 06:00:37 -04:00
Novacat
cd357dafd4 Update crossbow.dm 2020-07-14 01:18:35 -04:00
Novacat
144024b029 Update munitions.dm 2020-07-14 01:17:10 -04:00
Novacat
659ec1d31b Merge pull request #8406 from VOREStation/upstream-merge-7327
[MIRROR] Quick create improvements
2020-07-14 01:16:14 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Novacat
3b6040771b Update create_object.dm 2020-07-13 22:37:36 -04:00
Novacat
39eb384d97 Merge pull request #8405 from VOREStation/upstream-merge-7332
[MIRROR] Removes Punpun's Suit Sensors
2020-07-13 22:36:19 -04:00
Novacat
39b5a8d2e2 Merge pull request #8404 from Rykka-Stormheart/shep-dev-pda-fix
Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
2020-07-13 22:28:55 -04:00
Kates
b6003d6cd0 Quick create improvements 2020-07-13 22:27:16 -04:00
VirgoBot
3d787f1d1f Removes Punpun's Suit Sensors 2020-07-13 22:26:01 -04:00
Shadow-Quill
aab1c57962 Removes Punpun's sensors (#7332) 2020-07-13 22:26:00 -04:00
Rykka
9c66b2f269 Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
Fixes https://github.com/VOREStation/VOREStation/issues/8387 that happened as a result of the janicart rewrite, and them no longer starting with buckets.

Polaris PR incoming ASAP.
2020-07-13 20:50:26 -04:00
Novacat
fa65a3f226 Merge pull request #8403 from Novacat/nova-basicfixes
Slight Penetration Tweaks
2020-07-13 17:26:33 -04:00
Unknown
9c4a1e9bfd Slight Penetration Tweaks
- Default Minimum penetration for mechs changed to 10
- Default minimum damage for mechs changed to 5
- Ripley and Odysseus have 0 minimum penetration

Just took a double check at the armor changes for mechs and the initial values for these seemed a bit high. So going to tone these down a bit before release.
2020-07-13 17:13:43 -04:00
Novacat
97d63565fd Merge pull request #8390 from Rykka-Stormheart/shep-dev-booze-traits
Add Booze Traits!
2020-07-13 15:06:36 -04:00
Leshana
05c9b20b23 Merge pull request #8386 from VOREStation/upstream-merge-7328
[MIRROR] Move the vending machines into a separate file.
2020-07-13 14:40:19 -04:00
Leshana
f54c8f43bc Merge pull request #8359 from VOREStation/upstream-merge-7318
[MIRROR] Fixes oversight closet decl name
2020-07-13 14:39:32 -04:00
Leshana
1e27088ca4 Merge pull request #8358 from VOREStation/upstream-merge-7268
[MIRROR] Ports Bay's lockers/cabinets/crates/etc
2020-07-13 14:38:47 -04:00
Leshana
34da89bc8d Rename vending_vr to vending_machines_vr because vending_machines.dm is the file it is modifying. 2020-07-13 14:26:10 -04:00
Atermonera
e102a8c4c7 Move the vending machines into a separate file. 2020-07-13 14:23:39 -04:00
Novacat
d08316fb99 Merge pull request #8401 from VOREStation/upstream-merge-7330
[MIRROR] Species Vars Extension Pt2: Pain
2020-07-13 14:08:46 -04:00
Novacat
d015336882 Merge pull request #8399 from VOREStation/upstream-merge-7331
[MIRROR] Lite Security Uniform fix for Vox
2020-07-13 14:08:15 -04:00
Atermonera
851f40461f Fixes oversight closet decl name 2020-07-13 14:08:00 -04:00
Atermonera
2444066b69 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-13 14:06:49 -04:00
VirgoBot
c9997ceebb Species Vars Extension Pt2: Pain 2020-07-13 12:09:57 -04:00
Killian
70e9c69ff3 pain_mod implementation (#7330) 2020-07-13 12:09:57 -04:00
VirgoBot
bcb58f6647 Lite Security Uniform fix for Vox 2020-07-13 12:08:40 -04:00
AdmiralDragon
add8840700 Lite Security Uniform fix for Vox (#7331)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2020-07-13 12:08:40 -04:00
Novacat
57639fdad4 Merge pull request #8391 from Rykka-Stormheart/shep-dev-instadrunk-fix
Fix Slow Comfortable Screw Against the Wall
2020-07-12 14:54:25 -04:00
Rykka
0ae99a1407 Fix Slow Comfortable Screw Against the Wall
The drink was set to strength = 0 resulting in a multiply by 0 and infinite alcoholism. You'd literally commit alcohol coma and instant liver death on drinking this.
2020-07-12 12:11:42 -04:00
Rykka
55e9bca231 Add Booze Traits!
Upstream port of https://github.com/Yawn-Wider/YWPolarisVore/pull/619

Credit goes to @KillianKirilenko for this, I just ported this upstream and put all the traits in neutral.dm as per admin request!

**Description:**
This uses the universal alcohol_mod to allow for increasing/reducing the effects of ethanol based on the trait you've taken. Basically? You can get drunk more or less quickly. This does not change how fast you die when you start taking liver damage/tox, this only affects how fast alcohol makes you drunk.
2020-07-12 11:57:36 -04:00
Novacat
31f4f4a463 Merge pull request #8388 from Voidalynx/master
Added Khanivore to Protean
2020-07-12 00:24:40 -04:00
Voidalynx
e2ddda44dc Update alienwhitelist.txt 2020-07-12 03:21:50 +01:00
Novacat
ea80365a23 Merge pull request #8385 from Novacat/nova-basicfixes
Translocator pref fix
2020-07-10 18:34:39 -04:00
Unknown
0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -04:00
Novacat
7b7ae47fb1 Merge pull request #8384 from VOREStation/Verkister-patch-1
Fixes vr monkeycube boxes getting extra monkeys
2020-07-10 15:45:36 -04:00
Verkister
31b4bc1a6a Fixes vr monkeycube boxes getting extra monkeys
Fixes sobaka/saru/sparra/wolpin cube boxes spawning with bonus 4 regular monkeycubes
2020-07-10 11:54:36 +03:00
Novacat
23967ce999 Merge pull request #8379 from VOREStation/upstream-merge-7324
[MIRROR] Add a random mech spawner (Not mapped in yet)
2020-07-09 23:33:24 -04:00
Novacat
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls
BALL!
2020-07-09 20:08:21 -04:00
Novacat
f07945ec4e Update ripley.dm 2020-07-09 20:08:00 -04:00
Novacat
5b47aa2cf1 Merge pull request #8378 from VOREStation/upstream-merge-6799
[MIRROR] New book sprites + inhands
2020-07-09 20:06:44 -04:00
Novacat
68dd074905 Merge pull request #8382 from VOREStation/upstream-merge-7316
[MIRROR] Add Mechs damage & penetration thresholds along with other improvements.
2020-07-09 20:06:30 -04:00