Anewbe
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
Anewbe
bba014acfa
More plant things
2017-02-20 18:32:18 -06:00
Neerti
d398367e4c
Fixes a world << that crept in and apparently new lobby code.
2017-02-20 19:29:13 -05:00
Neerti
91dd3348c5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff
...
# Conflicts:
# code/modules/mob/living/carbon/human/human_movement.dm
2017-02-20 19:06:25 -05:00
Neerti
836d8dfa3f
More stuff, finalizes it I hope.
2017-02-20 18:28:31 -05:00
Anewbe
09e7d5aef9
Buffs Space Vines
2017-02-20 14:22:18 -06:00
Anewbe
8527a7c601
Removed a superfluous line
2017-02-18 10:33:17 -06:00
Leshana
19efa2ae5b
Jukeboxes are coded to have hackable wires, but don't respond to wirecutters or multitools. Fix that.
2017-02-15 21:06:38 -05: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
2eaf2c6ebb
Merge pull request #2993 from VOREStation/strref-fix
...
Re-fix for #2312
2017-02-09 21:24:52 -06:00
Anewbe
cb0e1d784a
Merge pull request #2992 from VOREStation/langlist
...
Updates adv scanner known_implants
2017-02-09 21:24:17 -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
Arokha Sieyes
258ed1f5f3
Re-fix for #2312
...
The implant is stored as a string-reference, not an actual pointer, so you have to use locate() to resolve it into an actual pointer to see if that matches the implant we're removing.
Fixes #2312
Fixes https://github.com/VOREStation/VOREStation/issues/196
2017-02-08 12:33:52 -05:00
Arokha Sieyes
5451ce7870
Updates adv scanner known_implants
...
Was showing a few as "unknown" even though one is added by every clone scan, and the other is available in loadout. Just nobody updated this here list.
2017-02-08 12:06:49 -05:00
Arokha Sieyes
f041b2a8e6
Rename mecha power cell
...
Sort of annoyng to have it named the same as an actual power cell, with a different max charge. If it's going to have a unique charge amount, it should have a unique name. High-cap cells are 10k, super are 20k, so this is some weird between-cell with 15k.
2017-02-07 09:37:02 -05:00
Neerti
1d9e7c8c08
works on planet stuff
2017-02-06 20:45:21 -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
MagmaRam
bb7cae4765
Merge pull request #2986 from Anewbe/antag_chat
...
Antag announcement papertrail
2017-02-05 18:09:38 -06:00
Anewbe
47a1fe134a
Merge pull request #2978 from nachomeep/master
...
Adds fannypacks.
2017-02-05 18:07:01 -06:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -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
3833a404c7
Antag announcement papertrail
2017-02-05 01:13:07 -06: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
79390b6177
Adds rugged style PDAs
2017-02-04 22:42:06 -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
f16ffb890d
Merge pull request #2969 from Anewbe/mining_cameras
...
Mining outpost camera console should work now
2017-02-01 16:21:23 -06:00
Anewbe
5e0a51bb72
Merge pull request #2951 from Anewbe/antag_numbers
...
Heist/Merc number changes
2017-02-01 16:21:13 -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