Commit Graph

6793 Commits

Author SHA1 Message Date
Novacat 28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
Atermonera 57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera 21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
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
Novacat 89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch
Persistence Patch
2020-08-21 01:14:04 -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
ShadowLarkens 5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07:00
Verkister 5b29b10db2 Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks
Victor zisthus/maptweaks
2020-08-16 21:16:04 +03:00
Rykka b586bb97e8 Fix Travis errors, define mapload as Initialize() argument 2020-08-16 10:08:51 -04:00
Rykka ad6870c78d Persistence Patch
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
2020-08-16 09:48:46 -04: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
Novacat be7206526a Merge pull request #8595 from lbnesquik/Kot-Janihound-tweak
Add a belly size upgrade for hounds and fix an important typo.
2020-08-08 16:30:46 -04:00
Novacat 5dcbaf77cd Merge pull request #8605 from Novacat/nova-shuttle
Translocator and Micromech Tweaks
2020-08-06 15:45:16 -04:00
Atermonera 8ca03da239 Merge pull request #7403 from dwinters99/mechtoy-and-arcade
Mechtoy and arcade
2020-08-06 14:45:03 -04:00
Novacat 369e3448ed Merge pull request #8602 from VOREStation/upstream-merge-7361
[MIRROR] Overdose changes + General chem mods
2020-08-06 02:59:32 -04:00
Unknown ac0831882f Translocator and Micromech Tweaks
- Translocators now have a delay similar to hypospray for targets not on help intent. Targets with AI will also have the delay
- Micromechs no longer have thicc armor
2020-08-05 22:57:10 -04:00
Atermonera 012a4a290c Overdose changes + General chem mods 2020-08-05 20:53:32 -04:00
Mechoid c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik c01019c25e Add a belly size upgrade for hounds:
- Researchable upgrade. It fits only hounds. It doubles the capacity of their sleeper for items. Usable only once. This does not affect number of patients.
2020-08-05 14:53:24 +02: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
Mechoid 78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Cyantime c70900f3f1 Fixes ambiguity of pizza portal location 2020-07-31 23:11:38 -04:00
Novacat c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377
[MIRROR] Species Vars Extension Pt3: Blood!
2020-07-31 17:19:01 -04:00
Heroman 00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Killian 84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera 65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04: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
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
ShadowLarkens 3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -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