cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-05-21 14:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,974 Commits 8 Branches 26 Tags
e6f679d147c75a405b080aa41e5b64158366b114
Commit Graph

6793 Commits

Author SHA1 Message Date
klaasjared 5631e420df Base Commit 2021-10-22 23:29:48 -04:00
klaasjared 3ebc4c1803 Base Commit 2021-10-22 23:21:29 -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
Heroman 3e2a12b433 Restricts candle boxes to only hold candles 2021-10-14 15:52:40 +10:00
MistakeNot4892 f4a050e9fa Merge pull request #8329 from Atermonera/smoking_in_space 
Unequipping mask slot won't disable internals when wearing airtight hats
 2021-10-10 05:36:30 -04:00
Verkister ad0102f30e Disables container quick-empty when in a belly 
The proc is coded to dump the contents exclusively on the turf, so a prey hitting that button on a storage item inside a gut would just tp it all onto the ground outside.
 2021-10-10 00:29:49 +03:00
Killian ac303a467d research & construction 2021-10-09 04:47:41 +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
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
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
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 a8b6476b8f Allows wiping food off cutlery 2021-08-30 20:07:29 -04:00
klaasjared 4f0c0bb747 Secondary Commit 2021-08-29 00:54:47 -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 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 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 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 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
MistakeNot4892 a20a6e9bc0 Vending machine throwing tweaks 2021-08-25 21:46:30 -04:00
MistakeNot4892 b25ed28367 Makes Fumo Un-Huge 2021-08-25 21:46:23 -04:00
MistakeNot4892 ac8ff7a5bd Merge pull request #8242 from Cerebulon/radiosounds 
Adds Headset Radio Sounds
 2021-08-25 21:45:08 -04:00
Novacat 1c8f196c83 Merge pull request #11478 from VOREStation/upstream-merge-8228 
[MIRROR] Added tabloid magazines.
 2021-08-25 09:18:57 -04:00
VerySoft b31effa630 Better formatting so Aro doesn't beat me up 2021-08-23 07:35:08 -04:00
VerySoft 25894314d3 Adds the ability to ban people from ghost roles 
There are some mobs you can play as now that are PRETTY ABUSABLE, and there's some players who play fine normally, but get into trouble and take things too far when you put them in special roles, SO! Rather than just flat banning those people from the server, it would be cool if we could just, ban them from playing those roles. 

This should help with that.
 2021-08-23 06:32:54 -04:00
Schnayy 224650ae4a Added tabloid magazines. 2021-08-22 20:24:02 -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
Aronai Sieyes 2baf13f632 Merge pull request #11421 from MisterGrimm/XenomorphOverhaul 
Fixes ancient corrosive acid problems for player xenomorphs, makes up to eight years worth of content unacidable
 2021-08-15 01:02:41 -04:00
Aronai Sieyes fd8da95ec7 Merge pull request #11408 from VOREStation/upstream-merge-8178 
[MIRROR] Stun Revolver Update
 2021-08-15 01:00:11 -04:00
Sym ed7f4b9e75 Fixes corrosive acid, makes most important things unacidable 
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
 2021-08-14 10:49:44 -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
Aronai Sieyes cccab8a39b Redo how animation metadata is stored 
Better fix than just copying Skyrat further
 2021-08-13 16:23:06 -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
Heroman 9a690a41df Fixes in split instead of input 2021-08-11 07:17:21 +10:00
Heroman face394b62 Fixes infinite material duplication in R&D 2021-08-11 06:57:48 +10:00