cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,174 Commits 9 Branches 26 Tags
269a4ebe6c7a047aaeae25fe863807c19c39e686
Commit Graph

3523 Commits

Author SHA1 Message Date
Ghost Actual
0085a5bd10 Adds more clothing from Polaris and various sources (#11546) 
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdca.

* Conflict Fix 2
 2021-09-27 14:31:10 -04:00
Casey
993dea7d8d Merge pull request #11566 from Verkister/patch-82 
Adds randpixel to vore eggs.
 2021-09-23 23:47:55 -04:00
Casey
2255a2b23c Merge pull request #11562 from PastelPrinceDan/belts 
Medical and utility belts of holding
 2021-09-23 23:47:32 -04:00
Casey
ffd496214a Merge pull request #11557 from VOREStation/upstream-merge-8252 
[MIRROR] Expands the material values of certain items.
 2021-09-23 23:44:10 -04:00
Casey
accc99d7fe Merge pull request #11554 from VOREStation/upstream-merge-8267 
[MIRROR] Removes an empty file. No clue what's the deal with this.
 2021-09-23 23:39:22 -04:00
Verkister
05ce3b3881 Adds randpixel to vore eggs. 
Laying several small eggs no longer stacks them all into a single sprite in tile center.
 2021-09-04 13:31:35 +03:00
PastelPrinceDan
40e2d09429 belts woo yeah 2021-09-03 20:26:27 +01:00
MistakeNot4892
d32f71020a Merge pull request #8252 from lbnesquik/Kot-material-costs 
Expands the material values of certain items.
 2021-09-02 22:20:16 -04:00
MistakeNot4892
1666450bf2 Merge pull request #8267 from lbnesquik/Kot-power-cells 
Removes an empty file. No clue what's the deal with this.
 2021-09-02 21:52:15 -04:00
klaasjared
4f0c0bb747 Secondary Commit 2021-08-29 00:54:47 -04:00
Aronai Sieyes
7ee6009e5e Merge pull request #11498 from VOREStation/upstream-merge-8240 
[MIRROR] Vending machine throwing tweaks
 2021-08-26 14:01:32 -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
MistakeNot4892
a20a6e9bc0 Vending machine throwing tweaks 2021-08-25 21:46:30 -04: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
klaasjared
1418044e6b Base Commit 2021-08-18 02:30:58 -04:00
VerySoft
e1ec5445e9 Stone bone axe fixxy 
It uses the wrong sprite!
 2021-08-16 18:04:48 -04:00
Aronai Sieyes
a8bf24b119 Merge pull request #11103 from Very-Soft/rocks 
Survival crafting stuff
 2021-08-16 12:00:42 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
Schnayy
ceb4488540 Stun Revolver Update 2021-08-13 18:17:21 -04:00
Ghost Actual
257f18b7ed Virology Revamp (#11384) 
* Base Commit

* The Manual

* Small Fix

Overlay issue discovered while testing

* Small Fix

* Small Fix

Forgot the Virgo effects in the book
 2021-08-13 11:37:41 -04:00
Ghost Actual
3018ff04b5 CHOMPStation Casino Port (#11301) 
* Create casino.dmi

* Base Commit

* Secondary Commit

* Third Commit

* Final Commit

* Final Final Commit

* Update casino_book.dm

* Update casino_cards.dm

* Update casino_cards.dm

* Update casinocash.dm

* The Claaaaaw

* Power Fix

* fix
 2021-08-07 17:32:35 -04:00
Aronai Sieyes
ef9b335ef6 Adds medical kiosk to code/buildable 2021-07-25 17:46:38 -04:00
Aronai Sieyes
ed28e8f3e6 Add recycling machinery 2021-07-23 18:45:18 -04:00
Aronai Sieyes
4bc01691d7 Fixes #11151 2021-07-19 17:42:16 -04:00
Novacat
982d88145d Merge pull request #11142 from Heroman3003/Talonflufffix 
Fixes Talon being referred to as if ITV is a company
 2021-07-19 11:11:38 -04:00
Heroman
cda873287c Fixes Talon being referred to as if ITV is a company 2021-07-19 14:10:32 +10:00
Killian
4a6adaf003 Fix Agent IDs 2021-07-17 11:19:35 +01: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
Aronai Sieyes
5fe677b2f1 Merge pull request #11093 from VOREStation/Arokha/emptynear 
Allow emptying contents from nearby bags
 2021-07-15 15:03:21 -04:00
Aronai Sieyes
d3f780bf1a Allow emptying contents from nearby bags 2021-07-15 14:41:52 -04:00
Aronai Sieyes
b3fb7c181d Make more object lists lazy to pay for my sins 2021-07-15 01:20:17 -04:00
Aronai Sieyes
2f08905c72 Rearrange icon files to have _vr for vore species 2021-07-15 01:19:18 -04:00
Aronai Sieyes
4ffc1b2e75 Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 19:47:19 -04:00
Aronai Sieyes
7f4b0f37b8 Add RSF to autolathes 2021-07-12 19:36:38 -04:00
Aronai Sieyes
6e450a1da4 Storage alt-click support 2021-07-12 11:39:02 -04:00
Aronai Sieyes
0be15a7482 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 16:12:04 -04:00
Aronai Sieyes
edc62e88fa Merge pull request #11002 from VOREStation/Arokha/rearrange 
Move like every clothing icon file
 2021-07-10 12:22:43 -04:00
Aronai Sieyes
4bb14ee3c8 Fix runtime on neural implant insertion 2021-07-10 12:15:38 -04:00
Aronai Sieyes
d7a32991eb Move like every clothing icon file 2021-07-09 18:13:28 -04:00
Anthony Rodriguez
c0f3d5834b Properly Adds Bio-Regenerator to Surgery Bag 2021-07-09 10:20:57 -07:00
Aronai Sieyes
3c00a44b92 Merge pull request #10989 from MarinaGryphon/issue/pocky 
Fixes pocky having no sprite.
 2021-07-09 12:16:54 -04:00
Aronai Sieyes
7e005ad239 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 12:16:38 -04:00
MarinaGryphon
6ef5eb51a9 Fixes pocky having no sprite. 2021-07-09 00:21:08 -05:00
MarinaGryphon
93a93b1885 Fixes #10885 2021-07-08 23:27:54 -05:00
MarinaGryphon
caee8d45b4 Changes existing do_afters to new exclusive flags. 2021-07-08 12:45:55 -05:00
Aronai Sieyes
8bcd31c91e Merge branch 'master' into Arokha/matdefs 2021-07-07 14:29:30 -04:00
Aronai Sieyes
7a0accba92 Merge pull request #10927 from VOREStation/Icons/eris+fixes 
Add pouches!
 2021-07-05 20:59:31 -04:00
Aronai Sieyes
a3afb8de53 Examine! 2021-07-05 20:10:36 -04:00
Aronai Sieyes
b2f14ac1cf Size tweaks 2021-07-05 19:49:57 -04:00