Commit Graph

10203 Commits

Author SHA1 Message Date
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
KasparoVy
d9b1e02405 Tails/Taurs Hide Shoes & Clip Uniforms/Suits
Hides shoes when the goat legs or taur bodies are selected.
Adds a method by which you can clip off parts of sprites, ported from Para.

Sets goat legs & taur bodies to clip off the lower parts of uniforms and suits
so long as the clothing doesn't hide tails or is a taur suit.
2019-08-20 01:56:08 -04:00
KasparoVy
e762c191ea Adds Ability for Tails to Hide Bodyparts
Adds a method for tails to hide bodyparts like legs to allow for a bit more spriter freedom. Sets Satyr legs & taur bodies to prevent regular legs from rendering when selected.

E.g.1 The Satyr legs & taur bodies prevent the regular leg organs from rendering, so you no longer have to sprite them such that they cover the pixels ordinary legs would've occupied.

E.g.2 The deer body has bulky front legs because if they weren't sprited to cover the regular body beneath you'd have wierd pixels poking out. This prevents that from happening by preventing legs from rendering when you got a taur tail.
2019-08-20 01:45:46 -04:00
Novacat
dea67ec3bb Merge pull request #5608 from Mewchild/MC-Quality
Removes Awoo speech
2019-08-19 16:55:19 -04:00
Novacat
d84f38b4db Merge pull request #5581 from TheFurryFeline/TFF-Faces_4_Seats
Allows you to sit on someone's head
2019-08-19 16:55:05 -04:00
Atermonera
9c3ef7da32 Merge pull request #6405 from Nalarac/patch-1
Changes Hooligan Crab Meat to Crab Meat
2019-08-19 01:03:57 -04:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
Heroman
b2f2d12da6 Fixes borgs not starting with their sizes set 2019-08-17 06:53:04 +10:00
Anewbe
4540551117 Merge pull request #6403 from Heroman3003/airuntime
Fixes language runtime upon ai creation
2019-08-14 21:38:28 -04:00
Mewchild
4ae966d3ff Removes Awoo speech 2019-08-14 03:47:01 -05:00
Heroman
349cc65134 Fixes customsay not working for non-admins 2019-08-14 17:06:37 +10:00
TheFurryFeline
223c23c100 No Blindess
Make it so you're not mechanically blind so you can hear regular emotes. But ICly, you'd still be blind, so.... Go nuts with that. :>
2019-08-12 18:02:34 -04:00
TheFurryFeline
58d1a95454 Sod it
Spent like five hours trying to get it to work in a different file but it might well be better to just.... Do a 1:1 port with //VoreStation edit comments as per code practice here.
2019-08-12 16:51:43 -04:00
Anewbe
74ab7a563f Merge pull request #6390 from Heroman3003/bot-patrols
Makes bot patrolling into a map var
2019-08-12 16:32:28 -04:00
Atermonera
6bb746995e Merge pull request #6401 from Shophaune/dronehatissues
Maybe fixes drone hat issues
2019-08-12 13:58:27 -04:00
TheFurryFeline
de2438a860 Find Your Seats
Ports ChompStation facesitting, pretty much. :>
2019-08-12 10:14:10 -04:00