962 Commits
Author SHA1 Message Date
Aronai Sieyes 7cd269d126 Make mine turfs a bit more happy 2021-05-30 23:46:01 -04:00
TheDavestDave 1331974826 replaces the vender holdout with an upgraded one
this holdout charges faster than the normal one
2021-05-29 21:33:26 +01:00
TheDavestDave 845056ecb0 Merge branch 'VOREStation:master' into master 2021-05-29 19:54:54 +01:00
izac112 b9034ce50b Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-28 06:15:01 +02:00
Aronai Sieyes 27b9451181 VS: Kwargs fixes 2021-05-27 12:10:22 -04:00
Aronai Sieyes 7d725e740b VS: Implicit list abuse 2021-05-27 12:08:51 -04:00
TheDavestDave b766d58f6b vender update
I noticed a typo on the bluespace glowstick that would of vended a normal stick. Also edited to fit the format
2021-05-26 16:34:00 +01:00
NeertiandVirgoBot 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
TheDavestDave 1e8308aea1 adds explorer equipment crate
adds a crate and fiddles with some points so that gearing up people we find and slow extra is possible from the vender. But much better done with the cargo crate. 10 cargo points for a crate was copied from the mining supply crate, I'd like it if someone would fiddle with the balance more.
2021-05-25 16:51:29 +01:00
TheDavestDave 3819458c9e Update survey_vendor.dm
I no longer fear machines taking over the earth, as they are stupid
2021-05-24 23:30:44 +01: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 a798742860 Update survey_vendor.dm
feck
2021-05-24 23:15:34 +01:00
TheDavestDave 17b4b32039 Update survey_vendor.dm
I forgot a comma
2021-05-24 23:13:43 +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
AtermoneraandVirgoBot bf07cddb6d Merge pull request #8074 from Atermonera/unmap_tin
Removes tin for ore generation
2021-05-23 15:40:02 -04:00
izac112 4fce6a03ac Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-23 18:26:00 +02:00
Aronai Sieyes 4e1308d48c Add mapping units/beacons for explo 2021-05-22 17:13:43 -04:00
izac112 fdff893613 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-11 00:22:20 +02:00
KillianandGitHub 5068041b8f Merge branch 'master' into kk-ships2 2021-05-10 17:42:03 +01:00
Aronai Sieyes c4610a858d Move ore lists to global lists 2021-05-10 12:13:39 -04:00
Killian 7238f3917e Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-09 20:19:20 +01:00
Killian 9f156e2e7d 1Z Talon - R2.0
banished 2z talon to the deprecated folder (begone ~~thot~~ block), fixed the refinery with a couple of hacks (now processes ore, doesn't give points!), and adjusted the custom spawners in cargo
2021-05-09 20:17:58 +01:00
NovacatandGitHub d9937399de Merge pull request #10192 from VOREStation/upstream-merge-8022
[MIRROR] Moves material stacks to modules/materials
2021-04-28 12:38:07 -04:00
AtermoneraandVirgoBot 52889d1262 Makes mineral turf ore list static (#8044) 2021-04-27 17:23:26 -04:00
izac112 bca4f5806e Voreupdate 2021-04-26 21:42:13 +02:00
Unknown c1eeea9efc Exploration Balance Tweaks
- Removes the Pathfinder's Frontier Carbine
- Removes the Pathfinder's Binoculars
- Adds the Frontier Carbine to the Survery Vendor, for 750 points. It has improved stats over a normal Frontier Phaser
- Adds binoculars to the survey vendor for 40 points
- Adds a Frontier Rifle, adminbus only for now
- Renames some frontier phaser sprites for additional clarity
- Adds two frontier holdout phasers to the exploration weapons locker
2021-04-26 14:03:40 -04:00
AtermoneraandVirgoBot d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
izac112 c2bd881332 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-04-16 18:49:51 +02:00
Unknown 86ab88d5f0 Updates some atoms 2021-04-15 18:46:11 -04:00
izac112 bc8a71afd0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-29 20:04:30 +02:00
Hatterhat 3b678d8c65 lets not make slag kkthx 2021-03-24 16:39:29 -05:00
izac112 3a0b6fbe50 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-12 07:20:13 +01:00
Unknown d8305caaeb Fixes ore deposits having icon error 2021-03-11 20:48:27 -05:00
izac112 9c6581fe6c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-11 17:36:42 +01:00
AtermoneraandVirgoBot 6db2020015 Merge pull request #7964 from Shadow-Quill/Cell-Fixing
Taking cell out of a standing drill now attempts to put it in your hands.
2021-03-10 14:20:14 -05:00
AtermoneraandVirgoBot 26be40158e Merge pull request #7955 from FenodyreeAv/MiningScanner
Adds an advanced version of the mining drill scanner.
2021-03-10 13:59:00 -05:00
NovacatandGitHub 8859e80f62 Merge pull request #9870 from VOREStation/upstream-merge-7937
[MIRROR] The Deep Scan Device
2021-03-09 19:02:40 -05:00
NovacatandGitHub 7fcb6e2f1a Update mine_turfs.dm 2021-03-09 15:55:46 -05:00
Unknown 190b805cad this sucks 2021-03-09 15:49:07 -05:00
AtermoneraandVirgoBot 3797ec6036 Merge pull request #7948 from Meghan-Rossi/stacker_fix
Fix stacking machine not stacking most materials
2021-03-07 16:20:54 -05:00
klaasjaredandVirgoBot 51a0ab5e37 The Deep Scan Device 2021-03-07 16:02:38 -05:00
izac112 054b1f0f8a Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2021-03-01 17:25:41 +01:00
MistakeNot4892andUnknown 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
izac112 e5f09a1182 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2021-02-23 07:32:20 +01:00
NovacatandGitHub bcaf7dcdff Merge pull request #9445 from VOREStation/upstream-merge-7369
[MIRROR] Department and Round Goals
2021-02-21 17:14:47 -05:00
izac112 7a646ce4ed Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2021-02-21 18:10:30 +01:00
NovacatandGitHub e3a19bb2ea Update ore.dm 2021-02-21 09:39:26 -05:00
NovacatandVirgoBot 13c59371c9 Porting Fixes 2021-02-20 02:08:18 -05:00
izac112 d4c9c95053 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2021-02-16 07:12:26 +01:00
Unknown 474794a2ff Fix Bugs
- Adds return to Ore New()
- Fixes wrong typepath for Merc thermals
2021-02-15 16:52:09 -05:00