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

11563 Commits

Author SHA1 Message Date
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
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
radiantAurora
ade30d85d0 the code side of things 2021-05-04 21:40:34 +01:00
Random-1245
9c40c8982a Shadekin trait fixes 2021-05-04 03:41:55 -05:00
ShadowLarkens
2edb618946 Remove the lore blurb that pollutes the new player menu with VOREStation edit tags 2021-05-03 13:21:24 -07:00
Unknown
468031cecf undefined var fix 2021-05-03 00:04:38 -04:00
Atermonera
d857988ce8 Swaps emote(me) out for custom_emote(). 2021-05-02 23:59:28 -04:00
Atermonera
f0913e3013 Body style selection and sanitizing refactor. 2021-05-02 23:57:07 -04:00
ShadowLarkens
1da76ed2b4 Personal Crafting & Dependencies 2021-05-02 18:10:59 -07:00
klaasjared
8bf825b991 REEEEEEEEE Spelling 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-28 16:57:01 -04:00
klaasjared
b5c5fa18a8 Spelling unfix 1 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-28 16:56:51 -04:00
klaasjared
9c4c0505dd Small changes 2021-04-28 00:26:21 -04:00
klaasjared
a5e59c4147 ... 2021-04-27 20:55:40 -04:00
klaasjared
2a928d66a7 HEY LOOK another fix! 
gvzrgbao[asdhasfh
 2021-04-27 20:48:57 -04:00
klaasjared
8f47acdafb small fix number #9999999 
*scream*
 2021-04-27 20:38:43 -04:00
klaasjared
2eedc63ba4 Merge branch 'Explo-Catalogue-Entries' of https://github.com/klaasjared/VOREStation into Explo-Catalogue-Entries 2021-04-27 20:31:53 -04:00
klaasjared
b957d4c1e0 Adds the Mimic 2021-04-27 20:31:47 -04:00
klaasjared
90bcb9bfe2 Spelling Fix 38 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-27 19:35:20 -04:00
klaasjared
5e333841e7 Spelling Fix 41 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-04-27 19:34:57 -04:00
klaasjared
2f8168e776 Sect Queen and Sect Drone Lore 
Adds lore for both the Sect Queen and Sect Drone
 2021-04-27 18:39:34 -04:00
klaasjared
7ae75efa98 Indent Fixes 
code go brrrrr
 2021-04-27 17:52:57 -04:00