1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
534623b1fd
Delete accidentally-added file from Commcard PR
2020-09-21 16:01:46 -04:00
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
a94f3189fd
Remove broken, unused commcard system from communicators
2020-09-21 12:37:52 -04:00
3f191e4204
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
e9566c606d
TGUI pAI Radio
2020-09-17 20:09:34 -07:00
bff1c92997
TGUI Communicators
2020-09-17 07:27:14 -07:00
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
a7481a394a
Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
...
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
165bb939c7
TGUI Uplink
2020-09-16 21:31:51 -07:00
637576848e
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07:00
411486f7b4
Move PDA to code/modules/pda
2020-09-16 21:31:49 -07:00
8c593664fe
Merge pull request #7607 from Mechoid/FixHacktool
...
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
ffdd8de3ce
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
28c19ee066
Merge pull request #8868 from VOREStation/upstream-merge-7571
...
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
21c1b12ef1
Colony Director -> Site Manager
2020-08-27 20:43:04 -04:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
097d4fa283
TGUI Research
2020-08-25 13:30:47 -07:00
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
5bbd5334b6
TGUI GPS & Mining Vendor & Ore Processing Console
2020-08-16 22:27:09 -07:00
5c02633707
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-13 20:01:22 +02:00
81871a960e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-10 21:50:42 +02:00
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
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
5dcbaf77cd
Merge pull request #8605 from Novacat/nova-shuttle
...
Translocator and Micromech Tweaks
2020-08-06 15:45:16 -04:00
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
012a4a290c
Overdose changes + General chem mods
2020-08-05 20:53:32 -04:00
50834e4a7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-02 23:52:01 +02:00
84128e72ff
blood mechanics tweaks ( #7377 )
2020-07-31 04:54:11 -04:00
65cfe5f6e3
Implements Status Indicators
2020-07-30 15:30:44 -04:00
9b4843da61
i think this is all the changes ?
2020-07-27 20:59:20 -03:00
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
c2618c0e66
Merge remote-tracking branch 'upstream/master' into tgui_wires
...
# Conflicts:
# code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
717a5fa049
aughe
2020-07-23 13:57:39 +12:00
3ea0e50432
Port TGUI Wire datums ( ParadiseSS13/Paradise#13769 )
2020-07-22 00:23:58 -07:00
0f05106e95
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-15 12:27:54 +02:00
896b000ae9
fixes bluespace radios
2020-07-14 17:01:00 +02:00
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
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
0cf3990f72
Translocator pref fix
2020-07-10 18:22:55 -04:00
22880f526d
Voreupdate
2020-07-02 15:39:00 +02:00
5fbc4f3189
Merge pull request #7304 from KillianKirilenko/kk-bio
...
Offload Defibrillatability from NO_SCAN
2020-06-25 15:44:49 -04:00
90a2053e57
Wrist-bound PDAs!
2020-06-21 16:42:05 -04:00
4864ad384d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-17 04:30:06 +02:00
bcd18e4997
Merge pull request #7278 from VOREStation/vplk-unused-image-assets
...
Remove Unused Image Assets
2020-06-14 21:32:34 -04:00
Cadyn