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,398 Commits 8 Branches 26 Tags
fcfa8a56bddb9bcabad6af9dfbe40fd2f5bb09f8
Commit Graph

2148 Commits

Author SHA1 Message Date
Killian
fcfa8a56bd Talon Improvements 2021-11-03 10:58:07 +00:00
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
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
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
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
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
af1aefca47 Separates Swimsuit and Athletic Lockers, Adds Wetsuits 2021-08-31 22:18:06 -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
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
8557966aee Adapt for virgo code 2021-08-26 13:57:19 -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
MistakeNot4892
2ad341babf Merge pull request #8241 from Cerebulon/disky 
Sleep Tight Disky
 2021-08-25 21:44:52 -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
Aronai Sieyes
9c2f8d371d Merge pull request #11464 from GhostActual/stunrevolver_fix 
Stun Revolver Fix
 2021-08-22 15:07:11 -04:00
klaasjared
2f00eae45e Small Fix 2021-08-21 12:14:33 -04:00
PastelPrinceDan
5b707dba47 add coats to their respective vendors/lockers woo 2021-08-20 17:27:34 +01:00
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai Sieyes
d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-19 12:20:09 -04:00
PastelPrinceDan
60324d8ce8 labbed coat 2021-08-17 15:38:15 +01: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
cbc246afb9 Merge pull request #11412 from VOREStation/upstream-merge-8198 
[MIRROR] Ports a ton of decorative mapping objects
 2021-08-15 01:06:38 -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
Aronai Sieyes
098357d11f Fix icon paths 2021-08-15 00:57:00 -04:00
Aronai Sieyes
98163fd3fa Fix merge conflicts 2021-08-15 00:50:25 -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
Aronai Sieyes
d6fd7c37a9 Ports a ton of decorative mapping objects 2021-08-13 23:30:16 -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
Killian
4b32da920f fix salamanders and wall-lockers 2021-08-12 20:29:34 +01:00
VerySoft
895a0574d5 Adds extra text to maint pred and morph spawns 
What's there doesn't really give any hints about what's allowed or expected, so, I added some, since there's been some understandable misunderstandings.
 2021-08-10 06:38:33 -04:00
VerySoft
bced5fb133 blep 2021-08-09 17:48:10 -04:00
VerySoft
80fac42aa4 make it not random :C 2021-08-09 17:48:10 -04:00
VerySoft
29b29bf8a6 Survival crafting stuff 
Stuff! For surviving in the wilderness.
 2021-08-09 17:48:10 -04:00
Aronai Sieyes
6677df399d Port of monster860's animated doors to bay closets 2021-08-08 19:41:48 -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
2783edc995 Merge pull request #11336 from VOREStation/Icons/skyratexting 
Skyrat extinguisher cabinet sprites
 2021-08-06 11:35:41 -04:00
Aronai Sieyes
8b8fd08d0e Skyrat extinguisher cabinet sprites 2021-08-02 13:31:25 -04:00
Aronai Sieyes
22494fd7ea Skyrat benches 2021-08-02 12:10:29 -04:00
klaasjared
5efd6c0396 Base Commit 2021-07-30 23:01:39 -04:00
Aronai Sieyes
5572e62c25 Remove atom/Uncross override 
It's the most overtime proc on the server
 2021-07-28 16:01:41 -04:00
Aronai Sieyes
4b4dc1e2e1 Merge pull request #11285 from VOREStation/Arokha/gasmix 
Exhale into drop pods
 2021-07-28 12:24:37 -04:00