845056ecb0
Merge branch 'VOREStation:master' into master
2021-05-29 19:54:54 +01:00
21658b8d85
Merge pull request #10401 from VOREStation/upstream-merge-8075
...
[MIRROR] Reverts recipe changes from Industrial Expansion
2021-05-27 13:16:06 -04:00
3ee63e782a
VS: Ambig OoO
2021-05-27 12:09:38 -04:00
767e655310
Linter Introduction + Cleanup
2021-05-25 23:19:34 -04:00
9c558c4844
grammer errors
...
this is why I dropped out of higher computing in high school
2021-05-24 23:23:53 +01:00
7fc0ff6213
explo vender stuff
...
adds a bunch of job gear to the explo vender. Suits, both normal phasers, catalougers, headsets, and now glow sticks, flares, and a new bluespace glow stick. A flare that doesn't run out and burn stuff more or less.
2021-05-24 23:04:16 +01:00
b69d1197a1
Removes contraband descriptor from translocators.
2021-05-24 03:48:13 +01:00
e3d239dab9
Merge pull request #8075 from Atermonera/revert_copper_recipes
...
Reverts recipe changes from Industrial Expansion
2021-05-23 15:41:50 -04:00
7cfd8f3435
Wall-mounted Geiger Counters
2021-05-23 15:40:14 -04:00
e42547db74
Various qdel helpers
2021-05-15 16:10:08 -04:00
c1167116c9
The Fix
2021-05-15 00:57:18 -04:00
0898ac4f9f
Refactors to be more specific to its purpose.
2021-05-09 13:25:34 +10:00
0437d0ae69
Adds Jams Sensors belly mode
2021-05-09 12:39:33 +10:00
1da76ed2b4
Personal Crafting & Dependencies
2021-05-02 18:10:59 -07:00
4690411915
Remove unnecessary 'signatures'
2021-04-08 12:39:14 -04:00
8844a0cb02
Merge pull request #10032 from Novacat/nova-ert
...
Adminbus Area Modifications
2021-03-29 13:21:54 -04:00
8b8b949d5f
Adminbus area modifications
2021-03-28 17:35:55 -04:00
c072f96104
Compatibility Fixes
2021-03-28 16:20:09 -04:00
c586a83071
Repathed/renamed seromi to teshari.
2021-03-26 15:38:02 -04:00
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
6639eb9d30
Merge branch 'master' into upstream-merge-7935
2021-03-18 10:42:23 -04:00
da20d3f024
GPS presentation/update tweaks/fixes.
2021-03-18 05:03:53 -04:00
20f4ff8384
Added think-tanks.
2021-03-18 04:09:42 -04:00
b782fed522
Merge pull request #9867 from VOREStation/upstream-merge-7928
...
[MIRROR] Added a GPS compass.
2021-03-09 17:58:49 -05:00
620da227bd
Resets GPS.dm
2021-03-09 17:43:49 -05:00
190b805cad
this sucks
2021-03-09 15:49:07 -05:00
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
964714e6ba
Added a GPS compass.
2021-03-07 14:16:58 -05:00
3e804dc799
Sideports a couple of init unit tests from Neb.
2021-02-27 13:05:16 -05:00
6bc897cd90
Update uplink.dm
2021-02-13 16:16:04 -05:00
3792afe56e
Telecrystals are only stored on the mind
2021-02-13 14:50:25 -05:00
fdf6761c11
Squashed commit of the following:
...
commit 2c04650659c2b6efe46cf7328a7935superverkelian@hotmail.com >
Date: Thu Feb 11 14:54:21 2021 +0200
Merge branch 'master' into communicator_video_enhancement
commit c2b6efe46c981d50f43c9a6def6c8asuperverkelian@hotmail.com >
Date: Wed Oct 28 15:07:20 2020 +0200
Merge branch 'master' into communicator_video_enhancement
commit 981d50f43cshadowlarkens@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
ea73111f61
Industrial Expansion
2021-01-27 23:30:50 -05:00
b6f7666e3c
Fixed global_announce autospeaker
2021-01-25 20:26:44 -05:00
f51f6ad710
Merge pull request #9573 from VOREStation/upstream-merge-7786
...
[MIRROR] Gadgets & Gizmos
2021-01-24 01:54:04 -05:00
f03fc5f240
Fixes defib timers being 10 times as long compared to intended
2021-01-24 09:58:45 +10:00
02ffbbe79b
Gadgets & Gizmos
2021-01-15 01:56:01 -05:00
5d0d3bb38d
Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff
2020-11-14 12:55:04 -06:00
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
1008e4cc95
HOLY FUCK THE HAT WORKS
2020-11-11 19:48:44 -06:00
af300cc037
This is *not* what _onclick is for FFS
2020-10-27 16:10:48 -07:00
de36b996b9
Makes wall-mounted machines layer above windows
2020-10-17 02:03:26 -04: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
TheDavestDave