Commit Graph

908 Commits

Author SHA1 Message Date
Casey 78db295130 Merge pull request #11581 from Hatterhat/vendor-momentor
mapping units go brr for explo
2021-09-23 23:54:30 -04:00
Hatterhat 62da165ea1 mapping go brr 2021-09-10 17:02:13 -05:00
Aronai Sieyes d88a792725 Merge pull request #11487 from Hatterhat/crusher-adv
fixes and tweaks for proto-kinetic melees
2021-08-26 12:27:06 -04:00
Aronai Sieyes 7994cd6eb3 Bad fix WIP 2021-08-26 12:07:53 -04:00
Aronai Sieyes e5c108269d Merge pull request #11454 from VOREStation/Arokha/stacks
Make stack amount var private
2021-08-26 11:38:33 -04:00
Hatterhat 3b2c53a9e3 fixes and tweaks 2021-08-24 00:18:56 -05:00
Hatterhat cb05e053a5 helLO i forgot to change an icon name 2021-08-22 16:08:49 -05:00
Hatterhat bfac91465b Crusher Gaming (#11462)
* [the who - baba o'riley plays in the background]

* i need more POWER

* rewrite pt1

* bug fixo

* uh oh! they're obtainable!

* verbs

* knif

* furthur cleanup

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-08-22 15:18:12 -04:00
Aronai Sieyes e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai Sieyes a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
klaasjared a8ffbce141 Base Commit 2021-08-14 02:21:47 -04:00
VerySoft 29b29bf8a6 Survival crafting stuff
Stuff! For surviving in the wilderness.
2021-08-09 17:48:10 -04:00
Atermonera 9d84e7881c Fixes Indoor Rain 2021-08-01 11:27:30 -04:00
Neerti 78f31a9b2d Adds optional area-based definition for outdoors-ness 2021-08-01 11:27:28 -04:00
VerySoft 4e684c996f make the mining one 3500 2021-07-22 15:18:02 -04:00
VerySoft c01ffaabdb Increase inducer vendor cost
90 points is so cheap that it's a no brainer, especially considering that the scanners share points in gaining, but not in spending, Somethings as potentially powerful as a portable recharger should not be so trivial to acquire.
2021-07-21 15:06:25 -04:00
Aronai Sieyes 669d23322c Change various things to subtypesof() 2021-07-20 12:54:59 -04:00
Aronai Sieyes 34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Heroman 7e2c850850 Finishes purge of Industrial Expansion 2021-07-20 16:30:45 +10:00
MarinaGryphon a843667af3 Fixes a bunch of bools missed in #11100 2021-07-16 15:55:49 -05:00
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