Commit Graph

17618 Commits

Author SHA1 Message Date
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
SweetBlueSylveon
ee60a1b717 Fixes a large number of issues brought up.
Fixes the roof for surface med.
Adds lights.
Changes the hallway disposals to a bin in the entertainment room.
Gives clowns entertainment access.
Fixes a pipe's visibility.
Adds shutter and tint control buttons where they were missing.
No the I'm not moving the goat he's my friend and he's staying in the freezer.
2020-07-25 05:23:15 -07:00
ShadowLarkens
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
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
Unknown
c4476fc51c Why is this still here 2020-07-24 09:08:18 -04:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
c1a5aee641 Merge branch 'master' into Tether-Tweak 2020-07-23 04:08:25 -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
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
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
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07: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
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
8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff
Adds dragon-y language and "*gao" emote
2020-07-21 18:12:43 -04:00
Killian
5d7cff1f7d areas, closets, other miscellaneous adjustments 2020-07-21 17:29:34 +01:00
Rykka
8d12b9f122 AI Restore Console Ported 2020-07-21 04:02:13 -04:00
SweetBlueSylveon
ed918bc40b The rest.
This adds atmos, adds the entertainer job, adds a spawnpoint for a clown or mime at roundstart if they have a whitelist, this is ready for testing.
2020-07-20 05:57:41 -07:00
Amy
51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -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
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
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
SweetBlueSylveon
b8f3cf9834 Fixed the bug.
Fixed the issue by changing the bitmap number.
Also adjusted xenoflora.
https://gyazo.com/d48fbda5dcc16300fa4bac4bc6af36f9
2020-07-15 14:49:57 -07:00
SplinterGP
8add547180 Map fixes and changes 2020-07-15 18:34:46 -03:00
SweetBlueSylveon
dafd8840c4 Tries to add "Xenobotanist"
Tries and likely fails to add "Xenobotanist" as its own job. Everything about this job edit is subject to change and staff/community conversation.
But please bear in mind this is a WIP.
2020-07-15 12:42:41 -07:00
Atermonera
e5265d43d9 Merge pull request #7335 from Cerebulon/blurSprites
Attempts to fix blurry icon scaling
2020-07-15 14:36:02 -04:00
izac112
0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02: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
izac112
896b000ae9 fixes bluespace radios 2020-07-14 17:01:00 +02:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -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
izac112
c9ba7202bc updates 2020-07-14 00:21:21 +02:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02: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
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
Unknown
0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -04:00