Commit Graph

3295 Commits

Author SHA1 Message Date
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2
Explorer/Pathfinder Belts
2020-08-25 17:15:14 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07: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
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
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat
Adds Mech Toy Battles!
2020-08-21 01:14:42 -04:00
Atermonera
3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape
Fix duct tape on self
2020-08-20 22:24:43 -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
Verkister
5b29b10db2 Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks
Victor zisthus/maptweaks
2020-08-16 21:16:04 +03:00
Victor Zisthus
69ac92250a Access Overhaul + Minor Map Tweaks
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
2020-08-15 18:26:43 -04:00
Rykka
5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2
TGUI Medical: Second Pass
2020-08-12 20:01:12 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
ShadowLarkens
5c6025b8e8 Merge remote-tracking branch 'upstream/master' into med_pass_2 2020-08-12 06:12:32 -07:00
Rykka
a5fc9d81ce Adds Mech Toy Battles!
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
2020-08-12 04:31:00 -04:00
ShadowLarkens
f156857e14 TGUI Appearance Editor (Mirrors & Admin) 2020-08-10 08:08:33 -07: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
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags.
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
2020-08-02 22:22:27 +02:00
Killian
c98499403b Update belt_vr.dm 2020-07-30 02:51:21 +01:00
Killian
71d332a636 Update belt_vr.dm 2020-07-29 05:44:59 +01:00
Killian
f6df2b83a8 explorer belts 2020-07-29 05:25:18 +01: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
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
62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
Novacat
2ae8cb3b9d Merge pull request #8331 from lbnesquik/Kot-Explorer-Shield
Make the explorer shield light slightly brighter
2020-06-28 12:52:11 -04:00
lbnesquik
b0435a32d5 Make the shield slightly brighter to reflect the gigantic bar on the front. 2020-06-24 06:05:52 +02: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
Unknown
0412103fc2 Vox Phoron and Adminbus Backpacks
- Fixes broken object sprites for adminbus backpacks
- Increases default air contents of Vox Phoron tank to 10 atmos (up from 6 atmos)
2020-06-14 12:15:58 -04: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
Aronai Sieyes
002b0ce5db Merge pull request #7801 from Holdelta/hol-rms
New Engineering Tool - RMS: Rapid Material Synthesizer
2020-06-07 14:01:57 -04:00
Atermonera
09d5356ba2 Merge pull request #7262 from lolman360/master
fixes hybrid crowbars
2020-06-04 22:26:59 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Aronai Sieyes
6483a18b6a Merge pull request #8007 from VOREStation/upstream-merge-7172
[MIRROR] Hybrid tools buffs.
2020-05-21 16:05:32 -04:00
Aronai Sieyes
af2a4cb216 Merge pull request #7998 from VOREStation/Arokha/issue7927
Tweak beartraps, alerts
2020-05-21 15:39:47 -04:00
Atermonera
b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools
Hybrid tools buffs.
2020-05-21 14:32:45 -04:00
Aronai Sieyes
bf3bdbf0e1 Traps don't get weird with removed limbs 2020-05-21 12:38:10 -04:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
Aronai Sieyes
26efe55d0f Merge pull request #7937 from VOREStation/Arokha/janicart
New janicart sprites/features
2020-05-17 22:39:53 -04:00
Aronai Sieyes
03c805a34a New janicart sprites/features 2020-05-17 16:49:03 -04:00
Aronai Sieyes
e5177a2a63 New jetpack sprite from Eris 2020-05-17 14:21:06 -04:00
Atermonera
5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Holdelta
66d808b43f Merge remote-tracking branch 'Holdevta/hol-rms' into hol-rms 2020-05-15 01:44:23 -07:00