Commit Graph

34092 Commits

Author SHA1 Message Date
Novacat
e5ea92a16c Merge pull request #4959 from Heroman3003/translocator-excl
Prevents translocator beacons from being sent away on supply shuttle
2019-04-08 07:58:32 -04:00
Heroman
59f369c3ef Prevents translocator beacons from being sent away 2019-04-08 17:10:28 +10:00
Novacat
336db60803 Merge pull request #4958 from Heroman3003/bsh-fixes
Fixes some issues with bluespace harpoon
2019-04-08 02:59:07 -04:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Novacat
f1eb438b89 Merge pull request #4952 from Heroman3003/un-customizing
Removes Height and Weight descriptors from accessible ones
2019-04-08 00:26:31 -04:00
Heroman3003
36ce5ec2dc Removes Height and Weight descriptors from accessible ones 2019-04-08 13:02:34 +10:00
Novacat
9c4365f700 Merge pull request #4951 from Heroman3003/relanging
Restricts monkey languages, changes keys on Sergal and Angel
2019-04-07 22:21:42 -04:00
Novacat
40fe329d4c Merge pull request #4950 from Heroman3003/pda-is-valid-id-holder
Fixes borg not being unlockable via PDA holding an ID
2019-04-07 22:19:10 -04:00
Heroman3003
ea1b347a40 Restricts monkey languages, changes the keys on existing 2019-04-08 12:02:16 +10:00
Heroman3003
ec6ee7268c Fixes borg not being unlockable via PDA holding an ID 2019-04-08 11:12:33 +10:00
Novacat
24a6731929 Merge pull request #4949 from Heroman3003/heart-of-the-cards
Fixes deck of cards bringing up unnecesary prompt when picked up
2019-04-07 20:59:49 -04:00
Heroman3003
f65ac4fce9 Fixes deck of cards bringing up unnecesary prompt when picked up 2019-04-08 10:49:56 +10:00
Novacat
9b72cc45f7 Merge pull request #4948 from Heroman3003/unflaggening
Fixes flags anchoring themselves wrong way
2019-04-07 20:44:56 -04:00
Novacat
73ae3ea202 Merge pull request #4947 from Heroman3003/exploration-wardrobe-and-more
Loadout adjustments for access and swimsuits
2019-04-07 20:44:43 -04:00
Heroman3003
b240e8d60d Fixes flags anchoring themselves wrong way 2019-04-08 10:34:21 +10:00
Heroman3003
e0e9158739 Loadout adjustments for access and swimsuits 2019-04-08 10:19:21 +10:00
Novacat
7f68d6cf40 Merge pull request #4946 from Heroman3003/i-sawed-this-scalie-in-half
Fixes broken dead lizard sprite
2019-04-07 20:15:19 -04:00
Novacat
168360ee07 Merge pull request #4937 from Heroman3003/micromech-fixes
Fixes micromechs using normal equipment
2019-04-07 19:54:36 -04:00
Heroman3003
3af17f032c Fixes broken dead lizard sprite 2019-04-08 09:48:31 +10:00
Novacat
80c0d9f8f3 Merge pull request #4943 from Heroman3003/italian-music-intensifies
Fixes frozen pizzas not having sprites in the box, also ports polaris fix
2019-04-07 19:42:40 -04:00
Heroman3003
55ebfbb38a Fixes borgs not getting timestamps on radio messages 2019-04-08 09:32:28 +10:00
Heroman3003
35208e6e48 Fixes frozen pizzas, also ports polaris fix 2019-04-08 09:22:03 +10:00
Novacat
70628015e5 Merge pull request #4940 from Heroman3003/didgerino
Makes Sonic Jackhammer a 'safe' mining tool
2019-04-07 18:57:21 -04:00
Novacat
e03bceee51 Merge pull request #4942 from Heroman3003/conveyorsal_vr
Fixes conveyors being unable to go backwards
2019-04-07 18:46:08 -04:00
Novacat
cde0d89dc4 Merge pull request #4939 from Heroman3003/another-polarisfix-port
Fixes being unable to climb ladders you're already on
2019-04-07 18:40:03 -04:00
Novacat
e654ad07e3 Merge pull request #4938 from Heroman3003/berries-and-grapes-get-your-ber
Fixes Berries and Grapes fruits for Alraune
2019-04-07 18:39:49 -04:00
Heroman
6a5a4ffb85 Fixes conveyors being unable to go backwards 2019-04-08 08:17:11 +10:00
Heroman
09b5ae0ac4 AND REMOVES THEM FROM NORMAL ONES 2019-04-08 07:38:22 +10:00
Heroman
f955d69bd9 Moves destroy_artefact vars to _vr file 2019-04-08 07:37:48 +10:00
Heroman
7d828a7777 Makes Sonic Jackhammer a 'safe' mining tool 2019-04-08 07:27:02 +10:00
Heroman
86a98230b9 Fixes being unable to climb ladders you're already on 2019-04-08 07:09:18 +10:00
Heroman
20fc3748ed Fixes Berries and Grapes fruits for Alraune 2019-04-08 06:48:08 +10:00
Heroman
18e00b3617 Fixes micromechs using normal equipment 2019-04-08 06:16:53 +10:00
Novacat
0ca3f6e216 Merge pull request #4936 from Heroman3003/walking-rewalking
Fixes swapping/stepping mechanics ignoring the basic passability
2019-04-07 15:50:08 -04:00
Novacat
4adac33a2f Merge pull request #4935 from Heroman3003/how-long-have-i-been-asleep-doc
Fixes disconnect timer message
2019-04-07 15:49:36 -04:00
Heroman
12183c890f Fixes swapping/stepping mechanics ignoring the basic passability 2019-04-08 04:48:48 +10:00
Heroman
0c69b1b650 Fixes disconnect timer message 2019-04-08 04:13:32 +10:00
Novacat
13b952ee63 Merge pull request #4932 from Heroman3003/fix-assortment
Assortment of fixes
2019-04-07 00:19:26 -04:00
Heroman
5a9e1f1566 Ports some fixes 2019-04-07 14:02:34 +10:00
Novacat
74b0e43eda Merge pull request #4930 from Heroman3003/fannening
Fixes tiny fans blocking people and not blocking atmos
2019-04-06 21:40:23 -04:00
Heroman
44780295c9 Fixes tiny fans blocking people and not blocking atmos 2019-04-07 11:14:31 +10:00
Heroman
9a2bcce710 Removes ability for non-player mice to open doors 2019-04-07 10:00:25 +10:00
Novacat
4d2bff5b5c Merge pull request #4926 from saysage/master
Adds colorable moth wings
2019-04-06 18:35:48 -04:00
Novacat
feca2decc0 Merge pull request #4927 from Heroman3003/hud-icon-testing
Fixes hud-zshadow bug
2019-04-06 18:30:37 -04:00
Heroman
98269cf3c6 Fixes hud-zshadow bug 2019-04-07 07:52:19 +10:00
saysage
9c47a9c986 Add files via upload 2019-04-07 00:15:20 +03:00
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Novacat
2be62bd672 Merge pull request #4922 from Novacat/nova-survival
Post-release Bugfixing
2019-04-06 13:50:00 -04:00
Novacat
6ebd9c048e Merge pull request #4921 from Heroman3003/fade-fix
Fixes some mob bugs
2019-04-06 13:38:15 -04:00