cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,827 Commits 8 Branches 26 Tags
080c72d703efd8b87d2e9028375e81ced2e812dd
Commit Graph

27138 Commits

Author SHA1 Message Date
Ketrai
080c72d703 Changes fried to cooked. 2021-05-28 00:09:52 +02:00
Ketrai
8122869588 Hotfix 
Hotfix
 2021-05-28 00:07:28 +02:00
Ketrai
627200efed Final fix, lil typo. 2021-05-17 23:57:35 +02:00
Ketrai
85794f77c0 Merge branch 'master' into fennetreatstwo 2021-05-17 23:45:13 +02:00
Novacat
1b1ed3372c Merge pull request #10345 from Heroman3003/spdrfix 
Fixes pixel offsets resetting on Giant Spider Queen
 2021-05-17 15:53:31 -04:00
Heroman
f3209959cc Fixes pixel offsets resetting on Giant Spider Queen 2021-05-18 05:28:31 +10:00
Killian
74612eaedd loadout tweaks 2021-05-17 00:24:34 +01:00
Ketrai
24a40b4c60 Attempt fix 
god
 2021-05-16 23:40:05 +02:00
Novacat
f4e98e84d3 Update movement_vr.dm 2021-05-16 14:11:34 -04:00
Verkister
b5222d656b Update movement_vr.dm 2021-05-16 19:14:12 +03:00
Verkister
c508d25d59 Fixes ghosts breaking dropnoms 
yeah
 2021-05-16 15:25:34 +03:00
Aronai Sieyes
2bcdf0b9ec Merge pull request #10310 from Novacat/nova-pathfinder 
Mecha Balance and Fighter Fixes
 2021-05-15 13:17:04 -04:00
Novacat
ba346f5f63 Merge pull request #10325 from VOREStation/Arokha/persistsheets 
Add persistent smartfridges with lossiness
 2021-05-15 13:15:08 -04:00
Novacat
dc043a8f53 Update dispenser.dm 2021-05-15 11:03:48 -04:00
Aronai Sieyes
a29a081d3e Fix a couple places that might cause belly emotes 2021-05-15 10:58:26 -04:00
Aronai Sieyes
3b8018b4be Readd emote cooldown 2021-05-15 10:50:30 -04:00
Aronai Sieyes
5df769f502 Restore old flip functionality 2021-05-15 10:44:03 -04:00
Novacat
b9eb4eac15 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port 
AR Visor
 2021-05-15 09:23:11 -04:00
TheFurryFeline
93b8773530 AR Visor 
Close https://github.com/CHOMPStation2/CHOMPStation2/issues/96

This adds something from pre-rebase Chompstation I always meant to add back in. Yay for motivation! Note: this is purely a cosmetic addition and a variation of a regular pair of AR glasses but you can change the tint in Char Setup. :3
 2021-05-15 08:59:17 -04:00
Novacat
4d940e54a4 Merge pull request #9969 from lukevale/master 
Adds in Booze hounds.
 2021-05-14 18:30:24 -04:00
lukevale
14e7ae9146 Cleans up the code after a month of it sitting with the errors. 2021-05-14 17:10:25 -05:00
Aronai Sieyes
2146e8f98a Update map_datum to specify persistence levels 2021-05-14 14:26:09 -04:00
Aronai Sieyes
2df96b1e6f Sticky note 10% fall chance 2021-05-14 14:26:01 -04:00
Aronai Sieyes
7bd9ac037a Convert persistence to JSON 2021-05-14 14:25:55 -04:00
Aronai Sieyes
7ff1861528 Add some 'lossy' smartfridges and options 2021-05-13 18:39:32 -04:00
Aronai Sieyes
f0ddc3b8b8 Merge pull request #10315 from VOREStation/upstream-merge-8042 
[MIRROR] Adds persistent smartfridges for garden products, material sheets
 2021-05-13 16:53:07 -04:00
Aronai Sieyes
ac5ec93548 Merge changes 2021-05-13 11:37:57 -04:00
Aronai Sieyes
f765cae30d Merge pull request #10309 from Novacat/nova-basicfixes 
Fixes Scream sounds
 2021-05-13 11:07:33 -04:00
Atermonera
62077da11c Adds persistent smartfridges for garden products, material sheets 2021-05-13 02:06:19 -04:00
TheFurryFeline
55bbaa7dd9 Actually, remove VS edit comment 
Gonna port upstream.
 2021-05-12 19:58:08 -04:00
TheFurryFeline
362e6a7f8a Stop SSD Snorers 
Stops SSD snoring. ~I think. Unable to test due to hearing disability.~

🆑 
tweak - stop snoring if SSD
/🆑
 2021-05-12 19:53:21 -04:00
Novacat
2ff4587ae0 Merge pull request #10311 from lm40/master 
RE-ADDS SQUISH
 2021-05-12 13:55:56 -04:00
lm40
89662bca8d actually i put this in a stupid/ugly spot 2021-05-12 13:42:58 -04:00
lm40
0c00ee9fd0 Update emote.dm 2021-05-12 13:26:26 -04:00
Unknown
720c5749e6 Mecha Balance and Fighter Fixes 
Earlyport of https://github.com/PolarisSS13/Polaris/pull/8081
 2021-05-12 12:44:15 -04:00
Unknown
f1320f86b7 Fixes Scream sounds 2021-05-12 12:39:08 -04:00
Aronai Sieyes
cd16f636e9 Merge branch 'master' into Arokha/removeoldnifmenu 2021-05-12 10:12:17 -04:00
Aronai Sieyes
25ab7a0900 Update code/modules/nifsoft/nif_tgui.dm 
Shadow's suggestion

Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
 2021-05-12 10:11:04 -04:00
Aronai Sieyes
d712732f7a Fix mystery characters in character setup screen 2021-05-11 23:43:35 -04:00
Aronai Sieyes
c8f7709f89 Deprecate NIF statpanel in favor of TGUI 2021-05-11 23:43:22 -04:00
Aronai Sieyes
327cb7219f Update emotes at the end of setting up body 2021-05-11 21:06:19 -04:00
Aronai Sieyes
b32df33cd1 Fix nme/nsay verbs and add starting_software 2021-05-11 21:06:08 -04:00
Aronai Sieyes
dc2c20ed89 Shuffle some synth things 2021-05-11 14:20:30 -04:00
Aronai Sieyes
f3d8c04216 Revert "Fixes SSMobs Shattering due to Proteans" 
This reverts commit aa9c0c566c.
 2021-05-11 13:27:43 -04:00
Aronai Sieyes
165992f29c Merge pull request #10292 from VOREStation/Arokha/protplaceholder 
Add placeholder for protean robolimbs
 2021-05-11 02:15:57 -04:00
Aronai Sieyes
d7f885b886 Add placeholder for protean robolimbs 2021-05-11 02:02:43 -04:00
Unknown
aa9c0c566c Fixes SSMobs Shattering due to Proteans 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
 2021-05-11 01:46:57 -04:00
Aronai Sieyes
9bf0df6c2d Fix NIF runtime 2021-05-10 23:10:33 -04:00
Unknown
4fdf2a1897 Fluff items 
https://forum.vore-station.net/viewtopic.php?f=27&t=1960

https://forum.vore-station.net/viewtopic.php?f=27&t=1958
 2021-05-10 17:17:56 -04:00
Killian
5068041b8f Merge branch 'master' into kk-ships2 2021-05-10 17:42:03 +01:00