cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 18:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,319 Commits 8 Branches 26 Tags
577b986ba68400caf01d6ff2a8db98fb13b3ad7f
Commit Graph

688 Commits

Author SHA1 Message Date
MarinaGryphon
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100) 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2021-07-16 13:43:25 -04:00
Ketrai
49cae359e8 Cold cavern tileset. 2021-07-12 02:01:51 -04:00
Aronai Sieyes
fa06696478 Merge pull request #10972 from VOREStation/Fixes/10941 
Fixes #10941
 2021-07-08 01:04:12 -04:00
Aronai Sieyes
ef879f9e1a Fixes #10941 2021-07-08 00:52:35 -04:00
Aronai Sieyes
c0d7dfdc39 Fixes #10967 2021-07-08 00:40:28 -04:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
MarinaGryphon
e41c2ecfd7 first pass (emotification, some \the -> \The) 2021-07-05 09:42:48 -05:00
Aronai Sieyes
b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
Aronai Sieyes
1d2eddce4b Merge pull request #10791 from VOREStation/Arokha/orehold 
Port Eris mining satchel sprites, satchel of holding
 2021-07-03 16:15:54 -04:00
Aronai Sieyes
6f49039269 Adds ore holding satchel to ORM 2021-06-28 14:40:23 -04:00
Aronai Sieyes
4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
Aronai Sieyes
c2b99d5916 VS: Requested fixes 2021-06-17 23:52:45 -04:00
Aronai Sieyes
db14882664 Port tg lighting system 
Also converts planet lighting to a new system
Too hard to separate out from this PR
 2021-06-17 00:18:09 -04:00
Aronai Sieyes
1696db4842 Move most/all overlay use to SSoverlays 
Except for the ones I'm about to change in the
lighting commits!
 2021-06-17 00:11:13 -04:00
Novacat
15495d45f9 Update survey_vendor.dm 2021-06-01 10:48:12 -04:00
Novacat
8bef30a8fb Update survey_vendor.dm 2021-06-01 10:21:31 -04:00
TheDavestDave
c1da12592e changes some things on ascian's request 
faster cranking holdout is out the vender until I can make a decent sprite for it
 2021-06-01 14:36:38 +01:00
TheDavestDave
67f7bdde1f deluxe explo suit change 
replaces deluxe explo suit to explo plate carrier, that I never knew existed until now
 2021-05-31 19:22:58 +01:00
TheDavestDave
b894100d37 deluxe explorer suit now explo plate carrier 
I have no idea how I didn't even know this existed until now
 2021-05-31 19:17:31 +01:00
TheDavestDave
aad267c72a replaces normal vender suit with a deluxe one 
just a name change for now. Don't want to fiddle with amour  and I can't give it more pockets like I wanted
 2021-05-31 19:01:26 +01:00
TheDavestDave
674362a862 Merge branch 'VOREStation:master' into master 2021-05-31 18:05:26 +01:00
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
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
Neerti
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
Atermonera
bf07cddb6d Merge pull request #8074 from Atermonera/unmap_tin 
Removes tin for ore generation
 2021-05-23 15:40:02 -04:00
Aronai Sieyes
4e1308d48c Add mapping units/beacons for explo 2021-05-22 17:13:43 -04:00
Killian
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
Novacat
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
Atermonera
52889d1262 Makes mineral turf ore list static (#8044) 2021-04-27 17:23:26 -04: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
Atermonera
d9fffdd07b Moves material stacks to modules/materials 2021-04-22 18:59:27 -04:00
Unknown
86ab88d5f0 Updates some atoms 2021-04-15 18:46:11 -04:00
Hatterhat
3b678d8c65 lets not make slag kkthx 2021-03-24 16:39:29 -05:00
Unknown
d8305caaeb Fixes ore deposits having icon error 2021-03-11 20:48:27 -05:00
Atermonera
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
Atermonera
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