Commit Graph

1542 Commits

Author SHA1 Message Date
Unknown 8b8b949d5f Adminbus area modifications 2021-03-28 17:35:55 -04:00
Cerebulon 382cbd4a93 News Update + Communicator Lag Fix (#7973)
* News Update + Communicator Lag Fix

* combined if. please merge this has been up way too long
2021-03-21 17:13:24 -04:00
Novacat 6639eb9d30 Merge branch 'master' into upstream-merge-7935 2021-03-18 10:42:23 -04:00
Atermonera da20d3f024 GPS presentation/update tweaks/fixes. 2021-03-18 05:03:53 -04:00
Atermonera 20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
Novacat b782fed522 Merge pull request #9867 from VOREStation/upstream-merge-7928
[MIRROR] Added a GPS compass.
2021-03-09 17:58:49 -05:00
Unknown 620da227bd Resets GPS.dm 2021-03-09 17:43:49 -05:00
Unknown 190b805cad this sucks 2021-03-09 15:49:07 -05:00
Unknown f2557a4834 Gateway for Heads, Pilot to Civ
- Adds gateway access to all heads of staff
- Moves pilot to Civilian department, though for PTO purposes they still count as exploration.

This is the result of some staff discussions.
2021-03-07 15:02:48 -05:00
Atermonera 964714e6ba Added a GPS compass. 2021-03-07 14:16:58 -05:00
MistakeNot4892 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat 6bc897cd90 Update uplink.dm 2021-02-13 16:16:04 -05:00
Schnayy 3792afe56e Telecrystals are only stored on the mind 2021-02-13 14:50:25 -05:00
Verkister fdf6761c11 Squashed commit of the following:
commit 2c04650659
Merge: c2b6efe46c f7328a7935
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Feb 11 14:54:21 2021 +0200

    Merge branch 'master' into communicator_video_enhancement

commit c2b6efe46c
Merge: 981d50f43c 9a6def6c8a
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Oct 28 15:07:20 2020 +0200

    Merge branch 'master' into communicator_video_enhancement

commit 981d50f43c
Author: ShadowLarkens <shadowlarkens@gmail.com>
Date:   Mon Sep 21 19:27:32 2020 -0700

    Communicator UI Improvements + Camera Console Moving Camera Fixes
2021-02-11 14:57:29 +02:00
Mechoid ea73111f61 Industrial Expansion 2021-01-27 23:30:50 -05:00
Cerebulon b6f7666e3c Fixed global_announce autospeaker 2021-01-25 20:26:44 -05:00
Novacat f51f6ad710 Merge pull request #9573 from VOREStation/upstream-merge-7786
[MIRROR] Gadgets & Gizmos
2021-01-24 01:54:04 -05:00
Heroman f03fc5f240 Fixes defib timers being 10 times as long compared to intended 2021-01-24 09:58:45 +10:00
Mechoid 02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Amy 5d0d3bb38d Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff 2020-11-14 12:55:04 -06:00
Unknown f6fc13003b Balance fixes and bugfixes
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
2020-11-14 12:20:46 -05:00
Amy 1008e4cc95 HOLY FUCK THE HAT WORKS 2020-11-11 19:48:44 -06:00
ShadowLarkens af300cc037 This is *not* what _onclick is for FFS 2020-10-27 16:10:48 -07:00
Meghan-Rossi de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04:00
Rykka 534623b1fd Delete accidentally-added file from Commcard PR 2020-09-21 16:01:46 -04:00
Novacat d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Atermonera a94f3189fd Remove broken, unused commcard system from communicators 2020-09-21 12:37:52 -04:00
ShadowLarkens 3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens e9566c606d TGUI pAI Radio 2020-09-17 20:09:34 -07:00
ShadowLarkens bff1c92997 TGUI Communicators 2020-09-17 07:27:14 -07:00
ShadowLarkens 9163d0b9b5 Remove broken, unused commcard system from communicators
This is being done to help facilitate the transfer to TGUI. These
commcards are part of a project that never really got finished, and the
majority of them do not even function in their current implementation,
with only barebone templates and half-made integration.

While it would be neat to have these function one day, I believe it
would be for the best to remove their current implementation wholesale
as this commit does, and allow them to be reintegrated at a later time
when communicators have been converted to TGUI and NanoUI has been
eliminated.
2020-09-17 07:24:30 -07:00
Novacat a7481a394a Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
ShadowLarkens 165bb939c7 TGUI Uplink 2020-09-16 21:31:51 -07:00
ShadowLarkens 637576848e TGUI PDAs Finale (minus newscaster) 2020-09-16 21:31:50 -07:00
ShadowLarkens 411486f7b4 Move PDA to code/modules/pda 2020-09-16 21:31:49 -07:00
Atermonera 8c593664fe Merge pull request #7607 from Mechoid/FixHacktool
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
Heroman ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
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 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
ShadowLarkens 097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
ShadowLarkens 5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -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 5dcbaf77cd Merge pull request #8605 from Novacat/nova-shuttle
Translocator and Micromech Tweaks
2020-08-06 15:45:16 -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
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
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