Commit Graph

760 Commits

Author SHA1 Message Date
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master
explo vender stuff
2021-06-01 14:58:32 +00:00
Aronai Sieyes
e89052c292 Merge pull request #10505 from VOREStation/Arokha/miscfix
Some misc runtime fixes
2021-05-31 03:57:35 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Nadyr
7e9a634611 Merge pull request #2012 from CHOMPStationBot/upstream-merge-10397
[MIRROR] [MIRROR] Removes tin for ore generation
2021-05-23 23:07:46 -04:00
Nadyr
09ecb2070b powder that make you say yes 2021-05-23 22:56:18 -04:00
Nadyr
d8f16f42a6 powder that makes you say yes 2021-05-23 22:48:17 -04:00
Nadyr
a95c9daf6f powder that makes you say yes 2021-05-23 22:39:08 -04:00
Novacat
f4b442e67d Merge pull request #10397 from VOREStation/upstream-merge-8074
[MIRROR] Removes tin for ore generation
2021-05-23 22:28:02 +00:00
Chompstation Bot
4d73aa5aca Add mapping units/beacons for explo 2021-05-22 21:48:00 +00:00
Razgriz
acd1db548e Merge pull request #1933 from CHOMPStationBot/upstream-merge-10280
[MIRROR] Allow more than one ore processor
2021-05-11 15:48:51 -07:00
Novacat
866824fa85 Merge pull request #10280 from VOREStation/Arokha/multiore
Allow more than one ore processor
2021-05-11 13:06:25 +00:00
Chompstation Bot
9e607da749 1Z Talon Project 2021-05-11 13:06:18 +00:00
Razgriz
cdf293dbb9 Merge pull request #1876 from Darlantanis/GlobalOreFix
Webedit ore spawning fix
2021-05-04 00:52:43 -07:00
Nadyr
b921922a45 missing YW comments 2021-05-01 22:59:23 -04:00
Nadyr
a96cf29a17 Update mine_turfs.dm 2021-05-01 22:57:13 -04:00
Nadyr
33761e0558 Update drill.dm 2021-05-01 22:55:52 -04:00
Razgriz
ad16d9629b Merge pull request #1857 from CHOMPStationBot/upstream-merge-10210
[MIRROR] Exploration Balance Tweaks
2021-04-30 19:36:55 -07:00
Nadyr
6ed37fd72a Merge pull request #1866 from CHOMPStationBot/upstream-merge-10192
[MIRROR] [MIRROR] Moves material stacks to modules/materials
2021-04-30 02:12:51 -04:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Novacat
79c8825c8e Merge pull request #10224 from VOREStation/upstream-merge-8044
[MIRROR] Makes mineral turf oretype list static
2021-04-27 21:41:20 +00:00
Chompstation Bot
2d30c1c04e Exploration Balance Tweaks 2021-04-26 18:14:21 +00:00
Chompstation Bot
d21a54ad80 Adminbus Update 2021-04-15 23:56:20 +00:00
Razgriz
156df2c64d egg 2021-04-01 00:20:57 -07:00
Nadyr
03afc88e27 Update shelters_vr.dm 2021-03-30 02:56:45 -04:00
Nadyr
c048cd365a Update shelter_atoms_vr.dm 2021-03-30 02:55:37 -04:00
Novacat
da6ed35551 Merge pull request #10012 from Hatterhat/rutile-moment
using rutile in alloys no longer makes slag
2021-03-26 13:46:33 +00:00
Nadyr
8e4da6b044 Merge pull request #1591 from CHOMPStationBot/upstream-merge-9922
[MIRROR] Fixes Ore deposits having icon error
2021-03-12 00:13:22 -05:00
Nadyr
62e293b890 Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894
[MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.
2021-03-12 00:05:38 -05:00
Novacat
d17efab021 Merge pull request #9922 from Novacat/nova-basicfixes
Fixes Ore deposits having icon error
2021-03-12 01:59:10 +00:00
Novacat
24a9d22855 Merge pull request #9898 from VOREStation/upstream-merge-7964
[MIRROR] Taking cell out of a standing drill now attempts to put it in your hands.
2021-03-10 19:30:10 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Nadyr
9d19cb12e0 Merge pull request #1547 from CHOMPStationBot/upstream-merge-9870
[MIRROR] [MIRROR] The Deep Scan Device
2021-03-10 01:45:55 -05:00
Nadyr
3e60113ea0 Update mine_turfs.dm 2021-03-10 00:33:43 -05:00
Novacat
9478017c49 Merge pull request #9870 from VOREStation/upstream-merge-7937
[MIRROR] The Deep Scan Device
2021-03-10 00:02:58 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Nadyr
81c2f9dac9 Merge pull request #1510 from Holdelta/MiningAdditions
Mining additions
2021-03-07 22:09:06 -05:00
Novacat
0109cb82c3 Merge pull request #9874 from VOREStation/upstream-merge-7948
[MIRROR] Fix stacking machine not stacking most materials
2021-03-07 21:48:35 +00:00
Test Turtle
875c71f157 Adding and re-adding quality-of-life items to mining
Given that we are to be more action-oriented, I believe that mining could do with a few small updates from more action-oriented servers.

- Adds larger ore satchels
- Adds(re-adds?) cooldown upgrades for kinetic accelerator
- Re-adds the diamond pickaxe
2021-03-06 16:40:13 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
32312e22b6 Update ore.dm 2021-02-23 03:24:24 -07:00
Chompstation Bot
f55f171cdf [MIRROR] Porting Fixes 2021-02-21 16:02:54 +00:00
Nadyr
ac10917edb Merge pull request #975 from CHOMPStationBot/upstream-merge-9421
[MIRROR] polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed
2020-12-13 21:07:30 -05:00
Chompstation Bot
ae92942bde Abductor Ship 2020-12-08 18:56:09 +00:00
Nadyr
dcd5d5f8df Update mine_turfs.dm 2020-12-08 03:48:46 -05:00
Chompstation Bot
f80607ae84 polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed 2020-12-07 17:03:03 +00:00
Razgriz
c92d0d0148 Merge pull request #771 from CHOMPStationBot/upstream-merge-9260
[MIRROR] Update phoron bore vender paths
2020-10-28 21:14:21 -07:00
Verkister
9311af3423 Merge pull request #9260 from Cyantime/patch-3
Update phoron bore vender paths
2020-10-28 12:47:15 +00:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708
[MIRROR] Makes wall-mounted machines layer above windows
2020-10-27 08:16:29 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00