Commit Graph

38326 Commits

Author SHA1 Message Date
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
94596abe76 Merge pull request #8407 from VOREStation/upstream-merge-7333
[MIRROR] Flavour Enhancement: Guns
2020-07-14 08:35:48 -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
Kates
b6003d6cd0 Quick create improvements 2020-07-13 22:27:16 -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
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
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
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
Killian
70e9c69ff3 pain_mod implementation (#7330) 2020-07-13 12:09:57 -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
Unknown
0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -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
Novacat
20749a4b63 Merge pull request #8381 from VOREStation/upstream-merge-7326
[MIRROR] Arrivals Shuttle Message Fix
2020-07-09 20:06:07 -04:00
Kates
2d2e2e41db Add Mechs damage & penetration thresholds along with other improvements. (#7316)
* Indent some comments for ease of read

* Edit the armor values to be more readable, also add radiactive and bio checks.

* Add damage threshold and penetration thresholds.
If you do not enough damage, it will simply bounce off consistently. Something that does 1 damage to a person would be so ridiculously nothing to a mech that it shouldn't achieve anything.
- If you throw a pebble at a mech, it will probably do nothing unless decently good as a weapon.
Additionally, your armor reduces the effectiveness of most attacks without a minimum of armor piercing.
- A flat hit with an hammer might be damaging to a squishy human, but it would probably not be all that effective against armored outerskin. The damage will be reduced to 2/3 or x0.66 to remark on this.

* Add a couple example values to the ripley and durand.

* Move the value by which failed penetrations damage is reduced to. God this is a mouthful to say out loud.

* Change the damage message from 'no denting' to 'bounces off'

* Fix an indentation error

* Small variable tweak.
2020-07-09 19:37:28 -04:00
Atermonera
a697e83ebd Merge pull request #7326 from Neerti/arrival_announcement_fix
Arrivals Shuttle Message Fix
2020-07-09 18:29:38 -04:00
Atermonera
3c16520a60 Merge pull request #7325 from Mechoid/FixTheStunShotsAgain
Fix runtime in projectile.dm, 664.
2020-07-09 18:27:21 -04:00
Kates
e4389f170c Add a random mech spawner (Not mapped in yet) 2020-07-09 18:13:36 -04:00
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
Killian
2006d45647 expand #8372 2020-07-09 05:24:16 +01:00
Killian
9adf026d61 Update maintenance.dm 2020-07-09 04:43:32 +01:00
Novacat
c24e309f33 Merge pull request #8375 from VOREStation/upstream-merge-7323
[MIRROR] Mech tweak - Break move_inside() into a verb & proc.
2020-07-08 22:30:18 -04:00
Novacat
05175e1a4c Merge pull request #8374 from VOREStation/upstream-merge-7321
[MIRROR] Fix Adv. Suit Belt
2020-07-08 22:29:59 -04:00
Novacat
87db25ae32 Merge pull request #8373 from VOREStation/upstream-merge-7322
[MIRROR] Add a forgotten strafing() call.
2020-07-08 22:29:40 -04:00
Kates
96c8ea6090 Mech tweak - Break move_inside() into a verb & proc. (#7323) 2020-07-08 21:24:12 -04:00
Killian
56503a9a67 Update robotics.dm (#7321) 2020-07-08 21:22:57 -04:00
Kates
752210084c Add a forgotten strafing() call. (#7322) 2020-07-08 21:22:45 -04:00
Killian
6b6f561f33 Streamlined Voidsuits Upgrade (#7300)
* veymed voidsuits upgrade

* unathi streamlined suit polish

* link to #7301

removes the specific checks from SSU.dm and adds no_cycle

* teshari subtype
2020-07-08 21:21:29 -04:00
Killian
721b456eea renamed them balls 2020-07-08 22:30:12 +01:00
Verkister
982e761b24 Fixed ID console finishing what the belly started
Fixed ID modification console forcibly wiping lost_access from the inserted card regardless of what button is pressed (even eject counts), effectively rendering any gurgled ID card complately unsalvageable at the restoring terminal.
2020-07-08 15:13:28 +03:00
Killian
0081e02688 Update balls.dm 2020-07-07 20:33:15 +01:00