Commit Graph

6793 Commits

Author SHA1 Message Date
Aronai Sieyes 4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Aronai Sieyes eb9de2cb7c Merge pull request #10411 from VOREStation/Arokha/aro3
Aro shipself v3
2021-05-26 21:09:34 -04:00
Neerti 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Aronai Sieyes e26a84c59e Allow better mapped-in marker beacons 2021-05-25 22:28:20 -04:00
TheDavestDave 9c558c4844 grammer errors
this is why I dropped out of higher computing in high school
2021-05-24 23:23:53 +01:00
TheDavestDave 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
DESKTOP-4BUBN9N\Mike b69d1197a1 Removes contraband descriptor from translocators. 2021-05-24 03:48:13 +01:00
Atermonera e3d239dab9 Merge pull request #8075 from Atermonera/revert_copper_recipes
Reverts recipe changes from Industrial Expansion
2021-05-23 15:41:50 -04:00
Atermonera 7cfd8f3435 Wall-mounted Geiger Counters 2021-05-23 15:40:14 -04:00
ShadowLarkens 4b6ce2af03 Fix only the first RPD ever interacted with working 2021-05-23 02:54:58 -07:00
klaasjared c380e04b0a Food 4 thought 2021-05-20 23:13:37 -04:00
Aronai Sieyes 29a89cf555 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 15:04:37 -04:00
Killian 02fb5b27e1 Pilot ID & Lockers 2021-05-17 13:47:25 +01:00
Killian 48fb3c6f81 explorer ID addons 2021-05-17 08:37:28 +01:00
Aronai Sieyes e42547db74 Various qdel helpers 2021-05-15 16:10:08 -04:00
klaasjared c1167116c9 The Fix 2021-05-15 00:57:18 -04:00
Atermonera a712cdf5cc Merge pull request #8069 from klaasjared/The-PCU
The Personal Computer Unit
2021-05-10 01:16:43 -04:00
Novacat 76148dfb7d Merge pull request #10257 from Novacat/nova-ert
Changes some Exploration Colors
2021-05-09 17:21:19 -04:00
Heroman 0898ac4f9f Refactors to be more specific to its purpose. 2021-05-09 13:25:34 +10:00
Heroman 0437d0ae69 Adds Jams Sensors belly mode 2021-05-09 12:39:33 +10:00
Aronai Sieyes 2431557ee3 Merge pull request #10178 from dwinters99/light-replacer
New belt items
2021-05-06 13:57:57 -04:00
Novacat e861d8707f Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 10:42:19 -04:00
Unknown d1437121f2 Merge remote-tracking branch 'VOREStation/master' into personal_crafting 2021-05-06 00:34:56 -04:00
Unknown 0e8a121598 Darkgreen better. 2021-05-05 15:39:28 -04:00
Unknown 85ae7db7e5 Ehh gold is terrible too 2021-05-05 14:32:46 -04:00
Unknown 9c0dd31171 Changes Exploration Color 2021-05-05 13:56:11 -04:00
Atermonera 8d4801b827 Ported the Bay/Nebula emote system. 2021-05-05 12:28:25 -04:00
ShadowLarkens 5c3a8254d0 Fix welding tools and cable coils as tools 2021-05-02 18:30:18 -07:00
ShadowLarkens 1da76ed2b4 Personal Crafting & Dependencies 2021-05-02 18:10:59 -07:00
David Winters a8921c5d51 HTML whoopsie-daisy 2021-04-29 20:56:18 -04:00
David Winters da16926680 Some comment removals 2021-04-29 20:49:07 -04:00
David Winters 6436a057a5 some in-hands 2021-04-29 19:58:03 -04:00
David Winters f8170258ae infinite snake fix 2021-04-29 19:41:38 -04:00
David Winters 4415f05959 Merge branch 'master' into toys 2021-04-29 14:35:52 -04:00
David Winters 768ff6b91a moth scream + snake popper 2021-04-29 14:33:26 -04:00
David Winters 47b19df21b mini spawner + arcade rotation 2021-04-28 11:58:37 -04:00
David Winters acc0243d4f icon fix for cat toys + confetti 2021-04-28 10:08:24 -04:00
David Winters 501df6d69e clown items removed to make way for separate PR 2021-04-28 08:35:03 -04:00
David Winters d0a8ce7ca3 file loss recovery 2021-04-27 06:41:57 -04:00
Atermonera d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
David Winters 0a5c5d974b nanopaste, spade, light replacer 2021-04-20 18:29:00 -04:00
Unknown 9fa1744f7f Changes blueprints to use ChangeArea 2021-04-20 18:09:07 -04:00
Novacat 995131f50b Merge pull request #10114 from dwinters99/sord
Captain's Rapier
2021-04-20 12:50:47 -04:00
David Winters 853ed259bf Update misc_vr.dm 2021-04-12 13:12:20 -04:00
Unknown 161354cb2a Fixes Point Defense Batteries 2021-04-11 14:58:12 -04:00
David Winters 25993e8eed Merge branch 'master' into sord 2021-04-11 01:39:38 -04:00
Novacat ba6a46808d Merge pull request #9800 from VOREStation/upstream-merge-7919
[MIRROR] Hybridizes Point Defense Turrets with Bay's System
2021-04-10 15:17:39 -04:00
Nyks b4c4d0c9c0 Fixed the conflicts for upstream merge 2021-04-09 20:07:33 +03:00
Aronai Sieyes 4690411915 Remove unnecessary 'signatures' 2021-04-08 12:39:14 -04:00
David Winters be762a81ed [DNM] holster stuff, doesn't work yet 2021-04-03 22:25:03 -04:00