Commit Graph

25418 Commits

Author SHA1 Message Date
Atermonera
a26d43c7f9 Merge pull request #7353 from Shadow-Quill/CheckExportTick
[SEMI-URGENT] Fixes hanging/crashing server when using the Export-Chatlog verb in OOC
2020-07-19 23:38:46 -04:00
ShadowLarkens
4ccbe71a51 setSharedState fix (tgstation/tgstation#52323) 2020-07-19 17:30:46 -07:00
Kates
a559223fa8 Correct a small typo 2020-07-19 17:47:48 +02:00
Cadyn
046266f504 Quick fix for more dumb typos aaa 2020-07-19 00:04:59 -07:00
Cadyn
9ee33fcd85 hot/cold-blood conflict prevention + points balancing 2020-07-18 23:51:00 -07:00
Cadyn
473f7a6c99 Fixed another silly mistake and a dumb grammar mistake. 2020-07-18 23:22:56 -07:00
Cadyn
161cc4237d Fixed a typo and added exclusions in addition to ACTUALLY TESTING IT THIS TIME :) 2020-07-18 23:18:13 -07:00
Cadyn
84b6621881 Added more custom species traits for temperature resistance 2020-07-18 22:46:06 -07:00
MrSign
9bff53564d Update dog_sleeper_vr.dm 2020-07-19 13:46:01 +10:00
ShadowLarkens
2d98903cca Add Fancy and Lock UI options, and fix an issue with fancy TGUI 2020-07-17 22:39:52 -07:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
Cadyn
ca43b44743 Added organ reset to the transformation code to fix problems with promethean->Zorren and the such causing suffocation because organs weren't properly changed during the tf 2020-07-17 21:44:07 -07: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
ShadowLarkens
58d1e52311 Whoops 2020-07-16 19:03:05 -07:00
ShadowLarkens
a1eb54e615 Convert all old nano_module crew monitors to TGUI, fix crew monitor for virgo 2020-07-16 18:58:37 -07:00
ShadowLarkens
a98b8f9764 Virgo fixes for TGUI Cam Console 2020-07-16 17:37:30 -07:00
Rykka
3974d7e87f Last Push - Everything is working, just needs testing! 2020-07-16 19:52:20 -04:00
ShadowLarkens
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
ShadowLarkens
e9f082d228 TGUI Camera Console Part 2; Moved to tgui_module, pending modular computer port
# Conflicts:
#	code/game/sound.dm
#	tgui/packages/tgui/public/tgui.bundle.js
2020-07-16 16:18:43 -07:00
ShadowLarkens
a20eef5bfb TGUI Camera Console - Part 1; Plain console done
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
2020-07-16 16:17:36 -07:00
ShadowLarkens
5fa431e37f Update to fix things after PolarisSS13/Polaris#7326 & update nanomap again 2020-07-16 15:00:39 -07:00
ShadowLarkens
2f298c1039 Final adjustments to the crew monitor, calling this good and happy. 2020-07-16 15:00:31 -07:00
ShadowLarkens
07adb888e2 Make TGUINanoMap actually somewhat as good as old NanoMap 2020-07-16 15:00:23 -07:00
ShadowLarkens
c1f037fc33 Minor fix for not repeating checks that default state already does 2020-07-16 14:59:52 -07:00
ShadowLarkens
1cded01770 TGUI v3.0
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
2020-07-16 14:59:45 -07: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
Novacat
98535d6699 Merge pull request #8416 from VOREStation/upstream-merge-7338
[MIRROR] Fix Pink Slime Extract Description
2020-07-15 16:03:17 -04:00
Atermonera
ed28d64eb5 Merge pull request #7336 from Cerebulon/mouseSpeed
Mice Go Fast Again + Rat Sprites
2020-07-15 14:37:44 -04:00
Atermonera
d0a746358f Merge pull request #7338 from r4d6/patch-1
Fix Pink Slime Extract Description
2020-07-15 14:37:31 -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
659ec1d31b Merge pull request #8406 from VOREStation/upstream-merge-7327
[MIRROR] Quick create improvements
2020-07-14 01:16:14 -04:00
Cerebulon
0b6c2646f4 Reorganized Library Computer Menu 2020-07-13 23:08:32 -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
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
Novacat
97d63565fd Merge pull request #8390 from Rykka-Stormheart/shep-dev-booze-traits
Add Booze Traits!
2020-07-13 15:06:36 -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
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
90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls
BALL!
2020-07-09 20:08:21 -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
20749a4b63 Merge pull request #8381 from VOREStation/upstream-merge-7326
[MIRROR] Arrivals Shuttle Message Fix
2020-07-09 20:06:07 -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
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
lbnesquik
146264ac89 Add a smell system, closely matching the flavor system.
The only real difference is that you can't smell reagents on people, as they don't have a smell ATM, but at the same time, how often did that really come to happen.
2020-07-09 20:19:12 +02:00