cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-04-06 12:01:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,722 Commits 10 Branches 26 Tags
4fdf2a18974307a684fc94de349057a431a81a41
Commit Graph

40714 Commits

Author SHA1 Message Date
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
Killian
a42682fdee Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-10 17:38:30 +01:00
Aronai Sieyes
c4610a858d Move ore lists to global lists 2021-05-10 12:13:39 -04:00
Unknown
e627c03ff0 Fixes Wing/Tail/Ear Sanitation 
Basically it forgot to account for species that can select their icon base.
 2021-05-10 10:00:41 -04:00
Novacat
25fcce0fa9 Merge pull request #10271 from Heroman3003/pizza-time 
Adds pizza guy uniform
 2021-05-10 03:19:30 -04:00
Atermonera
a712cdf5cc Merge pull request #8069 from klaasjared/The-PCU 
The Personal Computer Unit
 2021-05-10 01:16:43 -04:00
Atermonera
3ac3b76143 Merge pull request #8046 from Atermonera/view_global_variables 
Adds verb to VV global variables
 2021-05-09 20:34:09 -04:00
Novacat
76148dfb7d Merge pull request #10257 from Novacat/nova-ert 
Changes some Exploration Colors
 2021-05-09 17:21:19 -04:00
Killian
7238f3917e Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-09 20:19:20 +01:00
Killian
9f156e2e7d 1Z Talon - R2.0 
banished 2z talon to the deprecated folder (begone ~~thot~~ block), fixed the refinery with a couple of hacks (now processes ore, doesn't give points!), and adjusted the custom spawners in cargo
 2021-05-09 20:17:58 +01:00
Heroman
3c4f0d71ae Adds pizza guy uniform 2021-05-09 18:47:55 +10:00
Heroman
0898ac4f9f Refactors to be more specific to its purpose. 2021-05-09 13:25:34 +10:00
Heroman
0437d0ae69 Adds Jams Sensors belly mode 2021-05-09 12:39:33 +10:00
Novacat
c1a095e564 Merge pull request #10268 from Heroman3003/expand-mob 
Adds a big batch of mobs to maint pred pool
 2021-05-08 21:36:18 -04:00
Heroman
0a3fe08c64 Adds a big batch of mobs to maint pred pool 2021-05-09 11:17:24 +10:00
Heroman
d83a84c4e3 Merge branch 'master' into choke-gut 2021-05-09 10:47:03 +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
4e95d72466 Readd nif softshop descriptions as tooltips 2021-05-07 17:27:48 -04:00
Atermonera
a347843d02 Merge pull request #8064 from MistakeNot4892/styles 
Fixes Virgo #10254.
 2021-05-07 03:16:50 -04:00
Aronai Sieyes
d3d759757b Merge pull request #9947 from Little-119/itoldyoutomakethemmeatier 
Remove the throwing-people-to-the-floor effect of meteor strikes
 2021-05-06 14:10:02 -04:00
Aronai Sieyes
2431557ee3 Merge pull request #10178 from dwinters99/light-replacer 
New belt items
 2021-05-06 13:57:57 -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
Aronai Sieyes
e2dd026953 Merge pull request #10241 from Heroman3003/free-soulcatchers 
Makes soulcatcher a pre-installed software
 2021-05-06 13:34:01 -04:00
Aronai Sieyes
c4723381d6 Merge pull request #10221 from Novacat/nova-basicfixes 
Disables Suit Sensors in Dorms
 2021-05-06 13:33:49 -04:00
Unknown
dd86de0fb2 Optimization! 2021-05-06 13:00:38 -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
b21d5f3373 Minor Refactor 2021-05-06 12:30:03 -04:00
Unknown
a59441535f Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2021-05-06 12:16:46 -04:00
Aronai Sieyes
d718ae0df4 Merge pull request #10240 from Heroman3003/contamination-b-gun 
Removes access loss on ID contamination/digestion.
 2021-05-06 11:45:02 -04:00
Novacat
e861d8707f Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 10:42:19 -04:00
Verkister
fda5e0eafd Slightly raises nutrition cap to fix a vr feature 
Raises nutrition cap just enough to make the vorestation feeding fullness system work properly again.
https://github.com/VOREStation/VOREStation/blob/master/code/modules/food/food/snacks.dm#L79
 2021-05-06 14:52:02 +03:00
Novacat
06df3e1a90 Merge pull request #10258 from VOREStation/Arokha/notesfilter 
Simple player notes filter
 2021-05-06 01:17:43 -04:00
Unknown
d1437121f2 Merge remote-tracking branch 'VOREStation/master' into personal_crafting 2021-05-06 00:34:56 -04:00
Aronai Sieyes
ce7bbdc008 Simple player notes filter 2021-05-05 17:05:22 -04:00
Unknown
0e8a121598 Darkgreen better. 2021-05-05 15:39:28 -04:00
Novacat
e6cdf78d45 Merge pull request #10248 from VOREStation/upstream-merge-8058 
[MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-05 14:41:45 -04:00
Unknown
85ae7db7e5 Ehh gold is terrible too 2021-05-05 14:32:46 -04:00
Novacat
8c51c361b9 Update life.dm 2021-05-05 14:16:02 -04:00
Novacat
9b924e565c Update synthetics.dm 2021-05-05 14:14:18 -04:00
Unknown
f6497962a8 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-8043 2021-05-05 14:13:31 -04:00
Unknown
c01f04afac Merge remote-tracking branch 'VOREStation/master' into upstream-merge-8058 2021-05-05 14:12:03 -04:00
Unknown
9c0dd31171 Changes Exploration Color 2021-05-05 13:56:11 -04:00
Aronai Sieyes
b44f14cd7a Touchup soulcatcher emoting 2021-05-05 13:49:10 -04:00