cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,341 Commits 8 Branches 26 Tags
1af55da1c74e486c2f0e95ee659f89a3872847ed
Commit Graph

727 Commits

Author SHA1 Message Date
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
VerySoft
36ab4d8e5c The final Item Bank patch? 
Adds a few more restrictions, adds a confirmation prompt that warns about potential loss of contents, and checks contents for prohibited items.
 2022-02-06 18:15:22 -05:00
Casey
20655d5a98 Merge pull request #12150 from PastelPrinceDan/moni 
mining vendor 1000 thaler reward
 2022-02-06 09:12:41 -05:00
PastelPrinceDan
7d6e16b5dc 1k bundle 2022-02-05 18:10:57 +00:00
Hatterhat
51eca0c914 >= 2022-02-03 02:52:49 -06:00
Casey
8decebf5ae Merge pull request #11902 from Heroman3003/runtimefix 
Fixes runtime on digging turfs with minor finds
 2021-11-22 23:37:57 -05:00
Heroman
1896a12e51 Fixes runtime on digging turfs with minor finds 2021-11-22 17:42:01 +10:00
Heroman
03e4f17dcc Fixes active edges in gateway areas 2021-11-21 09:07:38 +10:00
Hatterhat
f14ccceb7d bruhhhhhhhhhhh 2021-11-18 22:30:54 -06:00
Hatterhat
a4e998854d repaths i forgor 💀 2021-11-18 16:34:03 -06:00
Hatterhat
1760663ac0 i forgot to test the KA offsite check lol 2021-11-09 00:02:04 -06:00
Casey
ffabce25b5 Merge pull request #11708 from Hatterhat/drill-buffs 
wacky haphazardly barely thought through standing drill buffs
 2021-10-27 12:10:19 -04:00
Casey
226802ff73 Merge pull request #11701 from Hatterhat/tg-ka 
ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
 2021-10-27 12:00:42 -04:00
Hatterhat
b20e2f818b forgot the indent 2021-10-26 01:09:48 -05:00
Hatterhat
f7a4a00d85 gorf 2021-10-26 01:00:36 -05:00
Hatterhat
2655ef17c3 machete resize oops, KA heat modulator 2021-10-25 18:36:45 -05:00
Hatterhat
b73457a199 makes KAs usable 2021-10-24 15:30:08 -05:00
PastelPrinceDan
bb16e834f9 actually let's comment it out isntead 2021-10-10 23:52:01 +01:00
PastelPrinceDan
c5913c25bb no more crashes PLEASE holy shit i'm DONE 2021-10-10 23:49:04 +01:00
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