Commit Graph

2980 Commits

Author SHA1 Message Date
Atermonera 9e76d0ca68 Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX
Fix a pizza issue.
2020-08-27 20:38:16 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Little-119 bcb07cfeef Add Romantical Whale's "shiny" clothes 2020-08-27 18:08:36 -04:00
Rykka 56d7235525 Adds Knight Boots to vendor/crate/POI, adds Lennie/George to Tether 2020-08-26 22:19:19 -04:00
Rykka 6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
2020-08-26 21:58:30 -04:00
Atermonera ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
ShadowLarkens 097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Novacat c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
2020-08-21 17:16:44 -04:00
Novacat 16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466
[MIRROR] Adds wearing cones and caution signs
2020-08-21 13:33:08 -04:00
Novacat a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449
[MIRROR] Flavour Enhancement: Vending
2020-08-21 13:32:37 -04:00
Verkister 929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Meghan-Rossi 470d76db4b Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
*Removes some autolathe entries made redundant by https://github.com/VOREStation/VOREStation/pull/8784
*Makes glass carafes and plastic pitchers batch-printable
2020-08-21 07:58:44 +01:00
Atermonera 4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-21 01:28:23 -04:00
Atermonera 444b2e6286 Merge pull request #7496 from lbnesquik/Kot-Pizza-tweak
Add a plastic knife to the pizzzaaaaa crate.
2020-08-20 22:21:53 -04:00
Atermonera 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid 496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Rykka e9ed73f6b5 Makes Pint Metaglasses Printable
TL;DR Only Virgo and downstreams can print metaglasses, but we never added printing for the pint version.
2020-08-19 16:52:41 -04:00
listerla c63d6c5777 Adds wearing cones and caution signs (#7466)
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
2020-08-17 12:59:40 -04:00
Atermonera 6c3273bd20 Merge pull request #7444 from Mechoid/FixAutolatheForging
Removes the ability to forge plasteel from steel.
2020-08-12 14:21:01 -04:00
ShadowLarkens 951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below)
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
2020-08-09 04:46:31 -07:00
Atermonera 91587c6904 Merge pull request #7398 from Cerebulon/stickyfixy
Stickynote tweaks
2020-08-08 23:50:23 -04:00
lbnesquik b5d7e3b3c8 Slightly lower the volume of shower loops. 2020-08-09 02:03:48 +02:00
ShadowLarkens dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
Novacat 088f634374 Update general.dm 2020-08-05 21:13:30 -04:00
Novacat 40c08685d2 Update general.dm 2020-08-05 19:35:33 -04:00
Mechoid c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
Mechoid 78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Unknown 69d12b8382 I was thinking in a different language 2020-08-01 16:50:05 -04:00
Unknown a7fb47de9c Structure/Machinery exploit fix 2020-08-01 16:40:17 -04: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
Cerebulon 8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -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 cdeb6b73cc Update supply.dm 2020-07-22 18:02:16 -04:00
Unknown 382e676ee2 Compatability fixes 2020-07-22 17:37:47 -04:00
ShadowLarkens 7453f64833 Adjusted some colors to make it more legible, added alien multitool magic 2020-07-22 01:03:00 -07:00
ShadowLarkens 3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Cerebulon 4a87460ba8 Flavour Enhancement: Crates 2020-07-21 22:20:30 -04: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
Novacat 144024b029 Update munitions.dm 2020-07-14 01:17:10 -04:00
Cerebulon f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -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
Aronai Sieyes e9c904b8e7 Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00
Unknown 19d7b71382 More miscellaneous changes 2020-06-14 13:46:16 -04:00
lbnesquik 41b9c802a7 Actually put two in the crate. 2020-06-11 04:24:36 +02:00
lbnesquik 856d48467a Introduce a SINGLE themed, colored explorer shield
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
2020-06-11 04:14:54 +02:00
Unknown 8d170c8468 Removes Exploration Weapon Permits 2020-06-02 19:35:36 -04:00