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
58,071 Commits 8 Branches 26 Tags
df1289dbca1dd3bbb24d0dbdc46809bdd8ebee0c
Commit Graph

11582 Commits

Author SHA1 Message Date
Aronai Sieyes
da4837903c Merge pull request #10433 from VOREStation/upstream-merge-8085 
[MIRROR] Linter Introduction + Cleanup
 2021-05-27 12:31:23 -04:00
Aronai Sieyes
27b9451181 VS: Kwargs fixes 2021-05-27 12:10:22 -04:00
Aronai Sieyes
3ee63e782a VS: Ambig OoO 2021-05-27 12:09:38 -04:00
Aronai Sieyes
7d725e740b VS: Implicit list abuse 2021-05-27 12:08:51 -04:00
Aronai Sieyes
4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Aronai Sieyes
00a42a96ea Finish polaris linter portions 2021-05-27 11:12:51 -04:00
Aronai Sieyes
42f624367f Make woofs forgetful 2021-05-26 00:17:16 -04:00
Aronai Sieyes
8b6742fbb1 Make nurse spiders forget target 2021-05-26 00:15:35 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Aronai Sieyes
bdd4c3c973 Add secret zlevels 2021-05-25 21:24:12 -04:00
Heroman
be41b14f9a Fixes proteans being a bit too liberal with reformation 2021-05-26 07:56:42 +10:00
TheFurryFeline
f4a05446e7 Requested Override 2021-05-23 14:50:52 -04:00
TheFurryFeline
229f8c37d1 Lore Fixy 2021-05-23 14:39:10 -04:00
Unknown
6a524b865b Compile Fix 2021-05-22 16:12:05 -04:00
Unknown
21d5da0f1b Manual port Polaris Fixes 
Ports https://github.com/PolarisSS13/Polaris/pull/8099 and https://github.com/PolarisSS13/Polaris/pull/8101
 2021-05-22 16:02:13 -04:00
Atermonera
20cc021888 Merge pull request #8089 from TheFurryFeline/TFF-Possibly_Fix_Cleanbots 
[Bugfix] Maybe Fix Cleanbots
 2021-05-20 23:52:55 -04:00
Aronai Sieyes
20e0fcd2d9 Merge pull request #10342 from Ketrai/fennetreatstwo 
Adds some fennec treats
 2021-05-20 15:54:05 -04:00
Aronai Sieyes
29a89cf555 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 15:04:37 -04: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
Ketrai
24a40b4c60 Attempt fix 
god
 2021-05-16 23:40:05 +02:00
Aronai Sieyes
e42547db74 Various qdel helpers 2021-05-15 16:10:08 -04:00
Aronai Sieyes
a29a081d3e Fix a couple places that might cause belly emotes 2021-05-15 10:58:26 -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
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
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
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
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
Heroman
0a3fe08c64 Adds a big batch of mobs to maint pred pool 2021-05-09 11:17:24 +10:00
Novacat
758c28808e Merge pull request #10222 from klaasjared/Explo-Catalogue-Entries 
Catalogue Entries V1
 2021-05-07 19:21:57 -04:00
Novacat
999a58c9ec Update code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:41:10 -04:00
Novacat
0ab1cb1dc0 Update code/modules/mob/living/simple_mob/subtypes/vore/rat.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:41:01 -04:00
Novacat
54849ff708 Update code/modules/mob/living/simple_mob/subtypes/vore/rat.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:40:56 -04:00
Novacat
df4a84e0f8 Update code/modules/mob/living/simple_mob/subtypes/vore/frog.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:40:49 -04:00
klaasjared
d48f458821 Adds requested changes 
Adds in the requested changes to the lore.
 2021-05-07 18:26:39 -04:00
Aronai Sieyes
dcf78ff2a7 Merge pull request #10250 from ShadowLarkens/lore_blurb_dumb 
Remove the lore blurb that pollutes the new player menu
 2021-05-06 13:47:33 -04:00
Novacat
21b5b96b6f Merge pull request #8912 from ShadowLarkens/clientdirmovement 
Fix view spinning reversing movement controls
 2021-05-06 12:40:19 -04:00
Novacat
da56c21a94 Merge pull request #9254 from Cyantime/patch-1 
Rabbits don't bumpnom anymore
 2021-05-06 12:32:44 -04:00
Unknown
d1437121f2 Merge remote-tracking branch 'VOREStation/master' into personal_crafting 2021-05-06 00:34:56 -04:00
Novacat
8c51c361b9 Update life.dm 2021-05-05 14:16:02 -04:00
Unknown
c01f04afac Merge remote-tracking branch 'VOREStation/master' into upstream-merge-8058 2021-05-05 14:12:03 -04:00
Aronai Sieyes
b44f14cd7a Touchup soulcatcher emoting 2021-05-05 13:49:10 -04:00
Aronai Sieyes
34a4637c33 Port custom VR emotes 2021-05-05 12:40:03 -04:00
Aronai Sieyes
9521347db3 Complete emote file cleanup and rescue VS edits 2021-05-05 12:29:15 -04:00
Atermonera
8d4801b827 Ported the Bay/Nebula emote system. 2021-05-05 12:28:25 -04:00