Commit Graph

522 Commits

Author SHA1 Message Date
Unknown 0d73c8ad76 Early Polaris Ports
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Unknown a7bc6b858d Redemption Machine Changes
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
2019-08-21 20:17:39 -04:00
Novacat 17c2ba18be Update equipment_vendor.dm 2019-08-21 17:49:53 -04:00
Mechoid ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Unknown fb61850896 Mining/Explorer Tweaks
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
2019-08-01 16:25:58 -04:00
Atermonera 1abe267189 Merge pull request #6314 from Nalarac/patch-1
Corrects Mining Vendor Entries
2019-07-22 00:42:53 -04:00
Novacat d48861c7e3 Merge pull request #5469 from VOREStation/upstream-merge-6245
[MIRROR] The great rock update.
2019-07-14 01:36:40 -04:00
Novacat d120748a38 Update equipment_vendor.dm 2019-07-13 22:59:47 -04:00
Atermonera 22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
Atermonera 9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Heroman c8d9bce55d Allows to compress coal into carbon sheets 2019-07-07 08:01:31 +10:00
Heroman d0b9ab620a Adds mining GPS to mining vendor 2019-07-02 12:08:05 +10:00
Novacat 9ac9317657 Merge pull request #5320 from Ketrai/fishingrod
Adds a durasteel fishing rod.
2019-06-18 17:50:55 -04:00
Neerti 4512cd7b18 Merge pull request #6200 from Heroman3003/xenoarch-fixes
Fixes some xenoarch bugs
2019-06-09 11:47:07 -04:00
Ketrai cea411049a Adds a durasteel fishing rod. 2019-06-07 16:48:35 +02:00
Atermonera 4cde759fac Merge pull request #6175 from Heroman3003/braceself
Fixed mining drill brace deconstruction issue
2019-05-28 13:11:27 -04:00
Unknown 31d7663bf1 Conflict Resolution 2019-05-06 14:32:18 -04:00
Novacat b4b5ca1eaf Update equipment_vendor.dm 2019-05-06 14:24:40 -04:00
Atermonera 90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Heroman 9d234f39ad Adds a bunch new PoIs to Underdark 2019-04-30 08:20:42 +10:00
Heroman 1b87b38c4a More PoIs 2019-04-30 05:39:42 +10:00
Novacat cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters
Adds KA holster to mining vendor
2019-04-24 01:27:58 -04:00
Atermonera eff39e3366 Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev
Marble ore [Exists] again.
2019-04-22 14:30:03 -04:00
Neerti 2ffe390346 Merge pull request #6116 from Mechoid/WhyAmIStupid
God damnit past me.
2019-04-22 00:27:50 -04:00
Heroman fef914b3bd Adds KA holster to mining vendor 2019-04-22 06:47:55 +10:00
Neerti 3b2c4c5271 Merge pull request #6083 from Heroman3003/runtime-lead-sand-whatever
Fixes runtiming with mineral turfs
2019-04-14 19:56:33 -04:00
Neerti 6441d365df Merge pull request #6080 from Mechoid/FixAccidentalAlchemy
Fixes My Idiocy
2019-04-14 02:48:40 -04:00
Neerti fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Heroman3003 b240e8d60d Fixes flags anchoring themselves wrong way 2019-04-08 10:34:21 +10:00
Heroman 09b5ae0ac4 AND REMOVES THEM FROM NORMAL ONES 2019-04-08 07:38:22 +10:00
Heroman f955d69bd9 Moves destroy_artefact vars to _vr file 2019-04-08 07:37:48 +10:00
Heroman 7d828a7777 Makes Sonic Jackhammer a 'safe' mining tool 2019-04-08 07:27:02 +10:00
Heroman 44780295c9 Fixes tiny fans blocking people and not blocking atmos 2019-04-07 11:14:31 +10:00
Novacat 1519496d9f Merge pull request #4849 from VOREStation/upstream-merge-5978
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
Neerti 30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Neerti fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Neerti b9adc37685 Standardizes rotation verbs 2019-03-27 03:17:07 -04:00
Neerti 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown 976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera 131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Screemonster 69d4688e28 Unpicks some mining spaghetti (#5978)
* Untangle xenoarch from mining somewhat

* professionalism

* sonic jackhammers only for artefact-safe tunnelling

* destroy artefacts code disabled on everything
2019-03-12 20:01:15 -04:00
Spades 6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades 71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747
[MIRROR] Makes fulltile windows seperate from dir
2019-02-25 08:57:19 -05:00
Unknown e4425a700d [5747] Makes this PR compile again 2019-02-17 01:34:20 -05:00
Unknown 7a22b9767c Adds Ascian's Shelter Capsule
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
2018-12-13 21:28:24 -05:00
Spades fe30b9a61d Merge pull request #4409 from Novacat/nova-pathfinder
Shelter Capsule Content Tweaks
2018-12-08 09:42:18 -05:00
kevinz000 fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Unknown e3889b60cb Moved everything into mapfile 2018-10-24 00:03:24 -04:00
Unknown c674f13de4 Nerfs Cash from Mining Vendor
The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.
2018-10-20 14:50:43 -04:00