cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 03:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,932 Commits 8 Branches 26 Tags
11c19e46ced4793ca2980cb236d8ef773b4c8afd
Commit Graph

10168 Commits

Author SHA1 Message Date
Novacat
11c19e46ce Update human_attackhand.dm 2019-08-31 22:22:04 -04:00
Novacat
c53a08d938 Update human_attackhand.dm 2019-08-31 22:21:44 -04:00
Novacat
d1ec7415f5 Update human_attackhand.dm 2019-08-31 22:18:06 -04:00
Atermonera
725d42b10c glove attack refactor 2019-08-31 18:08:17 -04:00
Rykka
981fa2febb Fixed Gitkraken Error. Oops </3 2019-08-31 06:32:58 -06:00
Rykka
83447b6d76 Adds Fen-PAI + Icons, Courtesy of VerySoft! <3 2019-08-31 06:27:24 -06:00
Rykka
e2093c332c pAI Fennec Chassis added 
Waiting on sprite from Soft <3
 2019-08-31 05:28:49 -06:00
Novacat
a39a8f8277 Merge pull request #5745 from Novacat/nova-basicfixes 
Minor Fixes Part two
 2019-08-31 01:39:01 -04:00
Novacat
cffaa2c9e4 Merge pull request #5711 from Rykka-Stormheart/Shep-dev-branch 
Mouse Tweaks, and fixes - Blame Polaris. <3
 2019-08-31 01:38:43 -04:00
Novacat
5dc04a75e8 Merge pull request #5718 from Heroman3003/morphology 
Adds morphs
 2019-08-31 01:35:42 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Unknown
975d879433 Minor Fixes Part two 
- Ion Spiders now use a weaker ion projectile
- Garbage collection now only complains if it takes longer than two seconds
 2019-08-30 20:29:02 -04:00
Heroman
f5f9c8e55e Makes it possible to mobswap with Fluffy 2019-08-31 06:13:19 +10:00
Heroman
81048cc4b4 Fixes description not updating on restoration 2019-08-31 05:22:01 +10:00
Spades
e116810e32 Merge pull request #5719 from Heroman3003/slimefix 
Fixes slimes not dying outside
 2019-08-30 07:41:28 -04:00
Rykka
c94d5271d2 Merge remote-tracking branch 'Virgo_Master/master' into Shep-dev-branch 2019-08-30 00:04:03 -06:00
Novacat
a006728e5d Merge pull request #5708 from Novacat/nova-basicfixes 
Minor Fixes
 2019-08-29 15:07:28 -04:00
Rykka
98b46766b3 Merge branch 'master' into Shep-dev-branch 2019-08-28 19:19:59 -06:00
Heroman
0cc54904e2 Fixes slimes not dying outside 2019-08-27 19:52:15 +10:00
Heroman
0ce08f5d36 Fixes meat and density 2019-08-27 15:54:31 +10:00
Heroman
0ebd19a37c Adds morphs 2019-08-27 14:18:17 +10:00
Atermonera
ec9f1e0e3d Merge pull request #6420 from Mechoid/WhyAmILikeThis 
Fix SLED infinite looping.
 2019-08-26 23:32:52 -04:00
Glassbrain
b8a202baa9 Customise Say Verb Change 
Changes the "customise say verb" verb to "customise speech verb", solving a small problem of inconvenience that arises when typing "say" incompletely into the command bar, such as if you have a bad habit solidifed into muscle memory.
 2019-08-26 19:19:39 -03:00
Novacat
c8a2fbb066 Update mouse_vr.dm 2019-08-26 16:09:05 -04:00
Rykka_Stormheart
c9f1bc43c3 I think I did this right? 
I'M SO CONFUSED.
 2019-08-26 12:27:53 -06:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Rykka_Stormheart
12ec96d9c2 Corrected edits to apply to _vr.dm files rather than source/master files where possible. 
Apologies for the possibly-sloppy edit to global_vr.dm </3
 2019-08-25 11:31:58 -06:00
Unknown
5aad52346a More Fixes 2019-08-25 12:38:34 -04:00
Spades
a33aebe454 Merge pull request #5712 from Mewchild/MC-Hivebot 
Changes Ion Hivebots to not have EMP
 2019-08-25 05:55:07 -04:00
Mewchild
426c7f9e6c Changes Ion Hivebots to not have EMP 2019-08-25 03:13:56 -05:00
Rykka_Stormheart
116f532169 Several mice tweaks, mainly: 
Uncommented out the mice pull_size and mob_pull - this fixes mice pulling lockers and shit.
Reduced mouse spawn time by half, since mice are nerfed now to not be able to pull large shit. (As they shouldn't be able to.)
Merged/incorporated file from https://github.com/VOREStation/VOREStation/pull/5709 - his was simple_animal, I moved it to simple_mob. All credits for changes in mouse_vr.dm go to them.

Small Fixes:
Added a little extra comment to the mice examine text. <3
Fixed the "Observe" Spawn timer - it originally said 5 minutes, fixed it to show the "actual" respawn time - 60 seconds.
 2019-08-25 00:15:33 -06:00
Novacat
6b8a80152f Merge pull request #5706 from Heroman3003/xenobio-sanity 
Adjusts xenobio closer to pre-refactor state
 2019-08-24 04:00:53 -04:00
Heroman
d71013d7f5 Adds exception for noscan species 2019-08-24 17:35:04 +10:00
Heroman
b0fa4e0dc7 Adjusts xenobio closer to pre-refactor state 2019-08-24 17:01:35 +10:00
Heroman
8f880a9d82 Fixes secbots ignoring access for pull attacks 2019-08-24 05:43:41 +10:00
Novacat
1f6e7ff5ed Merge pull request #5700 from Heroman3003/merc-heat-fix 
Fixes mercenaries in spacesuits dying from Virgo 2 heat
 2019-08-23 03:01:56 -04:00
Heroman
6a21eccbd5 Fixes mercenaries in spacesuits dying from Virgo 2 heat 2019-08-23 16:23:08 +10:00
Heroman
a20aa6be0b Fixes AI shells not getting the channels properly 2019-08-23 13:41:17 +10:00
Heroman
7c27f801f7 Restricts AI shells module- and z-level- wise 2019-08-23 12:25:21 +10:00
Novacat
2c4cd96be7 Merge pull request #5396 from KasparoVy/taur_hide_stuff 
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
 2019-08-21 22:15:53 -04:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Novacat
06fcadf97f Merge pull request #5688 from VOREStation/upstream-merge-6396 
[MIRROR] Chemistry Expansion
 2019-08-21 18:01:11 -04:00
Novacat
666d7836fc Merge pull request #5687 from VOREStation/upstream-merge-6410 
[MIRROR] Promethean Organ Tweakening
 2019-08-21 17:54:37 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1 
Promethean Organ Tweakening
 2019-08-21 17:40:45 -04:00
Atermonera
3d1f76e4f1 Merge pull request #6397 from Mechoid/BerserkUnblinding 
Blind rage doesn't mean actually make them blind.
 2019-08-21 17:30:09 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman
2238bc2e16 Fixes not being able to pick up or drop items in bellies 2019-08-21 16:53:14 +10:00
Heroman
c0de032943 Fixes Merc Commando's corpse being named Syndie Commando 2019-08-21 04:54:03 +10:00
KasparoVy
a94c975cfe Account for Taur Suits in Uniform Icon Generation - Suit Checking 
Since we don't clip when wearing taursuits in suit icon generation we gotta maintain the same behaviour when we check suits in uniform icon generation.
 2019-08-20 01:56:09 -04:00