Commit Graph

15113 Commits

Author SHA1 Message Date
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe
12a6ad40b2 Merge pull request #2995 from Screemonster/crateqol
QoL on abandoned crate puzzle
2017-02-14 17:00:35 -06:00
Anewbe
fae79a7f80 Merge pull request #2996 from MagmaRam/gunshow
Lock-on changes
2017-02-14 17:00:28 -06:00
Anewbe
95a670e562 Merge pull request #2994 from Leshana/backpack-drag-issue
Fixes dragging items with storage onto an occupied hand
2017-02-14 17:00:05 -06:00
MagmaRam
db5e832e28 Lock-on time is now 2.5 seconds. 2017-02-11 20:05:22 -06:00
Anewbe
c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
Screemonster
deb867215a QoL on abandoned crate puzzle 2017-02-10 00:14:10 +00:00
Leshana
283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Screemonster
cdc4e6e0f8 Adjusts CE_SPEEDBOOST to not just return -3 2017-02-07 00:48:43 +00:00
Anewbe
e5ba7ac622 Merge pull request #2987 from Leshana/signaler-qol
Signaler QoL Improvement - Method to copy setup from one signaler to another
2017-02-06 15:50:05 -06:00
MagmaRam
19af747e4e Adjusts targeting/hostage-taking to have a proper delay before shooting 2017-02-06 11:02:22 -06:00
MagmaRam
f92e189cc7 Fixes not being able to pick up sandwiches with a fork if they're at max size. 2017-02-05 19:25:59 -06:00
Anewbe
47a1fe134a Merge pull request #2978 from nachomeep/master
Adds fannypacks.
2017-02-05 18:07:01 -06:00
Leshana
f0945e31d7 Signaler QoL Improvement - Method to copy setup from one signaler to another
* Just tap them together and settings are copied.
* Code copied from https://github.com/tgstation/tgstation/pull/23340
2017-02-05 15:06:28 -05:00
Anewbe
f59d8d6c0b Merge pull request #2973 from Anewbe/dibs
Ahelp take button
2017-02-04 23:54:12 -06:00
Anewbe
b0a2e593e1 Merge pull request #2983 from Leshana/deconstruct-fax
Fixes Issue #2982 - Deconstruction of Fax Machine
2017-02-04 23:53:35 -06:00
Anewbe
68ea9a6e69 Adds a fix 2017-02-04 21:11:23 -06:00
Anewbe
cc9cc3c77d Merge pull request #2976 from Anewbe/vox_more_vox
Further tweaks to Vox and their toys
2017-02-04 21:07:49 -06:00
Anewbe
15c249eebd Merge pull request #2981 from Yoshax/mkaykids
Fixes runtimes
2017-02-04 21:05:31 -06:00
Yoshax
f497cbf5cf Droppers are known for being inconsistent and inaccurate 2017-02-05 01:41:50 +00:00
Leshana
4b5615ad69 Fixes Issue #2982 - Deconstruction of Fax Machine
* Fax machine's New() was not calling `..()` and therefore `circuit` was not being changed from a type to an instance.  Thus when deconstruct proc tries to read it's properties it can't.
* A search thru code found the aifixer had the same problem. Fixed it there too.
2017-02-04 17:34:03 -05:00
Yoshax
8c470a50eb rand can only output ints m'kay kids 2017-02-04 17:13:52 +00:00
Yoshax
547053a768 if you don't rename all of something, bad things happen m'kay kids 2017-02-04 15:46:03 +00:00
nachomeep
c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
Arokha Sieyes
2e6d423047 Fix chocolate milk
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
Anewbe
587044275c Merge pull request #2975 from Anewbe/spider_nerf
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Anewbe
fa18ec9909 Merge pull request #2974 from Neerti/1/31/2017_borg_typing
Fixes Borg Typing Indicator
2017-02-01 16:32:17 -06:00
Anewbe
4e824e0e2c Merge pull request #2971 from Neerti/1/28/2017_event_system_work
Continues work on new Event System
2017-02-01 16:21:03 -06:00
Anewbe
fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Neerti
088ebc328e Fixes Borg Typing Indicator
Borgs that are typing will no longer lose the indicator a second later.
2017-01-31 16:28:41 -05:00
Anewbe
dd38e42dc5 Ahelp take button 2017-01-31 15:27:07 -06:00
Neerti
9b9de138e6 Continues work on new Event System
Ports and adds some more events, including dust, meteors, carp, etc.
Tweaks meteors, now has a 10 minute warning beforehand and meteors only approach from one direction now.
2017-01-29 19:32:20 -05:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
701695ba07 Changes two taste descriptions 2017-01-28 20:57:54 -06:00
Anewbe
fa0096e6c0 Fixes some things that should make mining more interesting 2017-01-28 19:35:48 -06:00
Anewbe
9eb6851014 Merge pull request #2966 from Anewbe/vox_toy_fixes
Fixes some things with Vox toys
2017-01-28 16:19:55 -06:00
Anewbe
1973a5193a Fixes some things with Vox 2017-01-28 16:03:12 -06:00
Anewbe
43ca1c038a Merge pull request #2964 from Anewbe/regenerate
Diona can regrow limbs
2017-01-28 14:13:45 -06:00
Anewbe
1772c6f3a8 Merge pull request #2965 from Neerti/1/28/17_magnets_how_do_they_work
Fixes typo in research defines for a few things
2017-01-28 14:03:51 -06:00
Neerti
aa889d51db Fixes typo in research defines for a few things
Not sure how TECH_MAGNETS compiles if it doesn't exist but...
2017-01-28 14:52:02 -05:00
Anewbe
f924f5ef05 Diona can regrow limbs 2017-01-27 23:47:44 -06:00
Anewbe
b50190d762 Merge pull request #2934 from Anewbe/char_reset
Ports Bay's character resets
2017-01-27 20:44:54 -06:00
Neerti
49a00bc746 Fixes medium screen circuit bug
Medium screens should only show to the person holding the assembly now, instead of everyone seeing it.  That's what the large screen is for.
2017-01-27 02:23:06 -05:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe
61b2a7affd Merge pull request #2960 from Anewbe/aviators
Adds Medical and Meson Aviators
2017-01-26 22:33:42 -06:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
d8b905d30e Merge pull request #2957 from Neerti/1/19/2017_more_circuits
Electrical Revolution Circuit DLC
2017-01-26 21:46:44 -06:00
Anewbe
3d20774a41 Fixes a few more Vox Toy things 2017-01-26 16:25:28 -06:00