7238f3917e
Merge remote-tracking branch 'upstream/master' into kk-ships2
2021-05-09 20:19:20 +01:00
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
0437d0ae69
Adds Jams Sensors belly mode
2021-05-09 12:39:33 +10:00
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
0a3fe08c64
Adds a big batch of mobs to maint pred pool
2021-05-09 11:17:24 +10:00
d83a84c4e3
Merge branch 'master' into choke-gut
2021-05-09 10:47:03 +10:00
758c28808e
Merge pull request #10222 from klaasjared/Explo-Catalogue-Entries
...
Catalogue Entries V1
2021-05-07 19:21:57 -04:00
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
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
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
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
d48f458821
Adds requested changes
...
Adds in the requested changes to the lore.
2021-05-07 18:26:39 -04:00
4e95d72466
Readd nif softshop descriptions as tooltips
2021-05-07 17:27:48 -04:00
a347843d02
Merge pull request #8064 from MistakeNot4892/styles
...
Fixes Virgo #10254 .
2021-05-07 03:16:50 -04:00
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
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
e2dd026953
Merge pull request #10241 from Heroman3003/free-soulcatchers
...
Makes soulcatcher a pre-installed software
2021-05-06 13:34:01 -04:00
21b5b96b6f
Merge pull request #8912 from ShadowLarkens/clientdirmovement
...
Fix view spinning reversing movement controls
2021-05-06 12:40:19 -04:00
da56c21a94
Merge pull request #9254 from Cyantime/patch-1
...
Rabbits don't bumpnom anymore
2021-05-06 12:32:44 -04:00
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
e861d8707f
Merge pull request #10236 from dwinters99/toys
...
Toys expansion
2021-05-06 10:42:19 -04:00
06df3e1a90
Merge pull request #10258 from VOREStation/Arokha/notesfilter
...
Simple player notes filter
2021-05-06 01:17:43 -04:00
d1437121f2
Merge remote-tracking branch 'VOREStation/master' into personal_crafting
2021-05-06 00:34:56 -04:00
ce7bbdc008
Simple player notes filter
2021-05-05 17:05:22 -04:00
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
8c51c361b9
Update life.dm
2021-05-05 14:16:02 -04:00
9b924e565c
Update synthetics.dm
2021-05-05 14:14:18 -04:00
f6497962a8
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-8043
2021-05-05 14:13:31 -04:00
c01f04afac
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-8058
2021-05-05 14:12:03 -04:00
b44f14cd7a
Touchup soulcatcher emoting
2021-05-05 13:49:10 -04:00
0584a94243
Make human emote checking more lax
2021-05-05 12:40:03 -04:00
34a4637c33
Port custom VR emotes
2021-05-05 12:40:03 -04:00
9521347db3
Complete emote file cleanup and rescue VS edits
2021-05-05 12:29:15 -04:00
8d4801b827
Ported the Bay/Nebula emote system.
2021-05-05 12:28:25 -04:00
ade30d85d0
the code side of things
2021-05-04 21:40:34 +01:00
9c40c8982a
Shadekin trait fixes
2021-05-04 03:41:55 -05:00
ae3f707831
Fix/adjust smoleworld related spelling and strings
2021-05-03 16:58:01 -04:00
2edb618946
Remove the lore blurb that pollutes the new player menu with VOREStation edit tags
2021-05-03 13:21:24 -07:00
a9e9dd241d
Merge pull request #10247 from VOREStation/upstream-merge-8057
...
[MIRROR] Body style selection and sanitizing refactor.
2021-05-03 12:50:08 -04:00
a0b21ce29c
Compile error
2021-05-03 12:32:21 -04:00
ade5e51232
Fixes check
2021-05-03 12:22:49 -04:00
cdbee2a178
Merge pull request #10246 from VOREStation/upstream-merge-8056
...
[MIRROR] weather sounds adjustments
2021-05-03 08:43:42 -04:00
468031cecf
undefined var fix
2021-05-03 00:04:38 -04:00
2fa3ce770e
Merge pull request #10234 from klaasjared/Bringing-back-the-Bepsi
...
Bringing Back the Bepsi
2021-05-03 00:00:02 -04:00
d857988ce8
Swaps emote(me) out for custom_emote().
2021-05-02 23:59:28 -04:00
5c29ed9a57
Update 03_body.dm
2021-05-02 23:58:07 -04:00
f0913e3013
Body style selection and sanitizing refactor.
2021-05-02 23:57:07 -04:00
0ea62fe2f1
Merge pull request #8056 from Greenjoe12345/weather-sounds
...
weather sounds adjustments
2021-05-02 23:55:50 -04:00
5c3a8254d0
Fix welding tools and cable coils as tools
2021-05-02 18:30:18 -07:00
8583d9dbb6
Virgo tweaks
2021-05-02 18:25:26 -07:00
Killian