cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,278 Commits 8 Branches 26 Tags
5d3de0b351820573b41dd2fa78a2f8d65ff7d169
Commit Graph

9351 Commits

Author SHA1 Message Date
Casey
5d3de0b351 Merge pull request #11653 from VOREStation/upstream-merge-8313 
[MIRROR] Fixes displaced steel displaced
 2021-10-27 11:28:03 -04:00
Aronai Sieyes
cc609bdde4 Merge pull request #11589 from VOREStation/upstream-merge-8293 
[MIRROR] Adds multitools to roboticist/engi toolbelts
 2021-10-24 20:04:46 -04:00
Aronai Sieyes
ea4d9d16f7 Merge branch 'master' into upstream-merge-8281 2021-10-22 14:41:28 -04:00
Aronai Sieyes
68978a2838 Fix merge more 2021-10-22 14:39:51 -04:00
Aronai Sieyes
6a46891e93 Merge pull request #11544 from VOREStation/upstream-merge-8230 
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
 2021-10-22 14:23:22 -04:00
Aronai Sieyes
1831b69dac Merge pull request #11543 from VOREStation/upstream-merge-8246 
[MIRROR] Random Spawner Stuff
 2021-10-22 14:23:16 -04:00
Aronai Sieyes
6465859813 Fix merge 2021-10-22 14:08:51 -04:00
Aronai Sieyes
adaa9ea478 Merge pull request #11533 from VOREStation/upstream-merge-8236 
[MIRROR] Allows wiping food off cutlery
 2021-10-22 13:52:23 -04:00
Ghost Actual
60e1abe927 Misc additions I made while sleep deprived (#11535) 
* Base Commit

* Small Fix

* Small Fix

* Small Fix
 2021-10-22 13:49:13 -04:00
MistakeNot4892
3a1583802f Merge pull request #8313 from Verkister/patch-78 
Fixes displaced steel displaced
 2021-10-04 00:15:37 -04:00
Killian
8a1c6d1e85 my god jc, belts! 2021-09-27 20:09:59 +01:00
Aronai Sieyes
65629a26e1 Merge pull request #11591 from VOREStation/upstream-merge-8292 
[MIRROR] Fixes stray bugs
 2021-09-27 14:45:22 -04:00
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
Killian
1233dd7966 Merge remote-tracking branch 'upstream/master' into kk-knockknock 2021-09-26 15:58:59 +01: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
Casey
2b71ae6b90 Merge pull request #11530 from VOREStation/upstream-merge-8255 
[MIRROR] Reduces the volume of grabbing jumpsuits.
 2021-09-23 23:23:23 -04:00
Casey
086f935e85 Merge pull request #11526 from Very-Soft/spawner 
Update mob spawners/spawns
 2021-09-23 23:21:25 -04:00
Casey
51ebc41ee1 Merge pull request #11524 from GhostActual/boxed 
Boxing Day
 2021-09-23 23:20:55 -04:00
Killian
9703b1d444 sounds & safety 
- adds a click cooldown so you can't spam tons of noise
- doesn't flick the deny animation unless the door is closed and powered
- alt-clicking on an unpowered door knocks rather than buzzing
- adds a knocking sound for wood (from freesound)
 2021-09-17 23:40:58 +01:00
Killian
97b5cb426b KNOCK KNOCK. WHO'S THERE? 
ME! *KRAAAAK!*
 2021-09-14 07:01:24 +01:00
MistakeNot4892
67efbfb247 Fixes stray bugs 2021-09-12 20:17:24 -04:00
MistakeNot4892
0386f03c57 Merge pull request #8293 from Schnayy/toolbelt-change 
Adds multitools to roboticist/engi toolbelts
 2021-09-12 20:16:05 -04:00
Atermonera
7de1448c69 Misc runtime fixes 2021-09-09 20:07:50 -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
MistakeNot4892
af1aefca47 Separates Swimsuit and Athletic Lockers, Adds Wetsuits 2021-08-31 22:18:06 -04:00
MistakeNot4892
bb8762aaef Random Spawner Stuff 2021-08-31 20:28:34 -04:00
MistakeNot4892
a8b6476b8f Allows wiping food off cutlery 2021-08-30 20:07:29 -04:00
MistakeNot4892
a17011449c Merge pull request #8255 from lbnesquik/Kot-clothing-noise 
Reduces the volume of grabbing jumpsuits.
 2021-08-30 19:41:08 -04:00
VerySoft
4c6885a50f Update mob spawners/spawns 
Teppi can rarely spawn on Virgo 3b now after an incident where they were released and able to survive. 

This also makes it so that gaslamps, geese, and teppi are all in the same spawn pools and such, with gaslamps being 3 times as likely as geese, and teppi being very rare, this will result in the odd goose outside of the wilderness, but, geese are easy to beat up and slow, so, that's probably fine, especially considering how few spawns there are outside of the wilderness.
 2021-08-29 07:14:00 -04:00
klaasjared
4f0c0bb747 Secondary Commit 2021-08-29 00:54:47 -04:00
Sym
13cc171842 DO'H 
I don't know why I thought that was a good idea.
 2021-08-28 17:57:33 -04:00
Sym
0e45d5ddea Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-08-28 17:31:01 -04:00
Verkister
6c6105379d Fixes radio headset sound toggle not working 
Also makes them a little less loud.
 2021-08-27 18:27:54 -04:00
Aronai Sieyes
8c90e32ef3 Fix annoying runtime with exosuit fab 2021-08-26 19:51:00 -04:00
Aronai Sieyes
fd751928e5 Merge pull request #11499 from VOREStation/upstream-merge-8233 
[MIRROR] Ports sliding things along tables
 2021-08-26 16:17:18 -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
8557966aee Adapt for virgo code 2021-08-26 13:57:19 -04:00
Aronai Sieyes
c64af7bd6c Merge pull request #11497 from VOREStation/upstream-merge-8239 
[MIRROR] Makes Fumo Un-Huge
 2021-08-26 13:37:53 -04:00
Aronai Sieyes
f111b977f6 Fix merge 2021-08-26 13:33:06 -04:00
Aronai Sieyes
668ffdd90d Merge pull request #11495 from VOREStation/upstream-merge-8242 
[MIRROR] Adds Headset Radio Sounds
 2021-08-26 13:25:20 -04:00
Aronai Sieyes
1b54a180e0 Fix merge 2021-08-26 13:09:33 -04:00
Aronai Sieyes
794fae8235 Merge pull request #11493 from VOREStation/upstream-merge-8241 
[MIRROR] Sleep Tight Disky
 2021-08-26 12:52:54 -04:00
Ghost Actual
4bb386e166 Expanding Clothing Options (#11466) 
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
 2021-08-26 11:43:44 -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