Kelenius
afe48a1c48
Update2
2014-02-19 18:14:44 +04:00
Kelenius
b5ad117c01
Less snowflake-y
2014-02-19 17:28:02 +04:00
Kelenius
0cfa6ea316
Hydroponics tray is now a machine that can be upgraded with bigger matter bins for more water and nutriment capacity.
...
Tray icons will now only update when necessary.
Added cream, plant bag and mining satchel to biogenerator.
Biogenerator's messages are now shown on top of the menu, instead of a separate screen.
Examining the tray now tells you the name of the plant.
Hydroponics trays start without nutriment, more E-Z-Nutriment added to vendor to compensate
Seed vending machine's contents are now sorted.
2014-02-19 14:13:00 +04:00
Aranclanos
b78c7eca06
Merge pull request #2809 from hornygranny/throwspeed
...
throwspeed pass
2014-02-17 06:26:06 -02:00
Razharas
b198ea5c9a
Merge pull request #2795 from AnturK/machinegunqueen
...
Fix for neurotox machine gun queens
2014-02-16 08:45:16 -08:00
Razharas
be73e9d09f
Merge pull request #2771 from fleure/eggs
...
Increased egg hatch rate and reduced chicks in crate
2014-02-16 08:37:49 -08:00
Razharas
923f8fc565
Merge pull request #2800 from MrPerson/del_in_progress
...
Only report emitter/SMES deletion if the round's in progress.
2014-02-16 08:36:25 -08:00
Razharas
b48efdaed0
Merge pull request #2761 from Incoming5643/blobjob
...
Blobize edge case fix
2014-02-16 08:28:46 -08:00
fleure
e6269beb3f
Merge pull request #2782 from Aranclanos/jobmasterruntime
...
Small runtime fix, job preference change before setup
2014-02-16 14:36:21 +00:00
fleure
aead3ee208
Merge pull request #2770 from Aranclanos/singularitynomnom
...
singularity spawn() runtimes
2014-02-16 14:30:47 +00:00
fleure
30d5da6205
Merge pull request #2769 from Aranclanos/handcuffedhands
...
you can't give items to people handcuffed.
2014-02-16 14:26:52 +00:00
Razharas
f31654b499
Merge pull request #2700 from Incoming5643/statuesarecool
...
Animate statues in magic stuff/Staff of Change rebalance
2014-02-16 00:38:47 -08:00
Hornygranny
9d3f8f6a2d
second pass
2014-02-15 20:11:12 -08:00
Hornygranny
9e14c22747
Reduces throwspeeds on all items to realistic levels.
2014-02-15 19:58:03 -08:00
MrPerson
68ad6f352f
Merge pull request #2768 from Rockdtben/removeUnusedRadarVar
...
Removed two unused variables.
2014-02-15 19:13:13 -08:00
Aranclanos
663d8c2632
Merge pull request #2778 from hornygranny/throwfarce
...
Rebalanced strange throwforces
2014-02-15 14:14:48 -02:00
Razharas
cd1a54bbd9
Merge pull request #2699 from metaglog/chemmaster_drugfactory
...
Adds a new option to the Chemmaster 3000 to mass-produce pills
2014-02-15 06:37:08 -08:00
fleure
e0f74d0449
Merge pull request #2762 from Incoming5643/crushacanforjayowen
...
Jay Owen demands that this pull be merged
2014-02-15 10:26:26 +00:00
MrPerson
c551018db2
Only report emitter/SMES deletion if the round's in progress. Should mean less log/message spam because of the emitter crate.
2014-02-15 00:18:10 -08:00
AnturK
cf2d12771f
Fix for neurotox machine gun queens
2014-02-15 00:51:33 +01:00
Aranclanos
64df810700
adds a small check to see if the job controller started up before using buttons related to it and generate runtimes.
...
Usually these kind of new things are happening due to the amount of time that away missions take to load.
2014-02-14 02:37:31 -03:00
hornygranny
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
Rockdtben
0ffbc6bad2
Merge pull request #2758 from hornygranny/monkeynecromancy
...
Fixes #2383
2014-02-13 17:21:39 -06:00
Fleure
9f35b24dd7
Increased egg hatch chance from 10% to 25%
2014-02-13 19:15:58 +00:00
fleure
4ef72bd071
Merge pull request #2746 from Ergovisavi/pai_runtimes
...
Fixes runtimes generated by the pai mob when it tries to click on things
2014-02-13 18:48:24 +00:00
Cheridan
3eb2ecb933
Merge pull request #2721 from Razharas/ActualTurbineFix
...
Actual turbine fix
2014-02-13 12:05:18 -06:00
Cheridan
6bd80b5b85
Merge pull request #2756 from hornygranny/bearpelt
...
Fixes #2728 , removes fedora tip
2014-02-13 11:53:08 -06:00
Cheridan
fbcacb4fa4
Merge pull request #2755 from hornygranny/syndieborg
...
Fixes #2723
2014-02-13 11:39:19 -06:00
Aranclanos
940aa0574d
you can't add items to people handcuffed.
...
Moved some stuff around on the equipping code, stuff might go wrong but I can't see anything yet.
2014-02-13 13:58:53 -03:00
Aranclanos
18d7081d33
removes a spawn() from the singularity consume proc that was causing runtimes. I think it also makes the singularity less laggy? Or maybe it's just a placebo effect.
2014-02-13 13:17:18 -03:00
Rockdtben
5768a0d58e
These variables aren't used anywhere in the code. Removed.
2014-02-13 10:12:35 -06:00
Razharas
838f0db091
Merge pull request #2697 from Alek2ander/master
...
HREF exploit fixes and other research stuff
2014-02-13 03:45:22 -08:00
fleure
f5b9c53e45
Merge pull request #2744 from Cheridan/hydro
...
Fixes hydroponics setter procs
2014-02-13 11:44:25 +00:00
Razharas
ad0071c8a5
Merge pull request #2625 from Tenebrosity/box2550Away-update
...
Readds slime and AI corpse to box away
2014-02-13 03:43:23 -08:00
fleure
db0009d334
Merge pull request #2693 from Giacom/spooky_scary_statues
...
Just some general polishing for the statue mobs.
2014-02-13 11:36:21 +00:00
fleure
5c5bc9a0ec
Merge pull request #2695 from Incoming5643/avastyeblobies
...
Blob zombie quickfix and the most minor bugfix ever
2014-02-13 11:33:34 +00:00
Cheridan
28a11b4db2
Merge pull request #2736 from Ergovisavi/who_smashes_the_smashers
...
Removed environment_smash for a few hostile mobs that don't need it.
2014-02-13 02:00:29 -06:00
Incoming
458e955366
Merge branch 'master' of https://github.com/tgstation/-tg-station into blobjob
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-02-12 21:37:59 -05:00
Incoming
39e67ae092
Jay Owen demands that this pull be merged.
...
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
2014-02-12 21:30:44 -05:00
hornygranny
aa303fac2d
Monkey attack messages now use span class
2014-02-12 16:43:31 -08:00
Incoming
883ab28dde
Blobize edge case fix
...
Fixes an edge case for blobize where if you open someone's player panel and they ghost between then and when you hit the blobize button it still gives priority to them for the created blob.
Note that you can't usually get the option to blobize a player if they've left their body before you open the player panel, if you want to blobize a specific person in this way, ask for them to return to their body.
2014-02-12 19:13:18 -05:00
MrPerson
e602febd40
Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit
...
Fixes misc grammar issues
2014-02-12 15:17:17 -08:00
hornygranny
4933571c5e
Changed "Monkey (420) has bit x" messages to "(Monkey (420) bites x"
2014-02-12 13:57:47 -08:00
Razharas
2edc78a4fb
Merge pull request #2676 from Tenebrosity/nospacefallspls
...
Removes falling over in space, fixes #2680
2014-02-12 13:16:59 -08:00
hornygranny
1db0b1be71
Fixes #2383
2014-02-12 13:12:45 -08:00
hornygranny
9baa64e006
Fixes #2728
...
Removes robust fedora tipping functionality
2014-02-12 11:12:32 -08:00
hornygranny
fc25325c24
Fixes #2723
2014-02-12 11:06:00 -08:00
Ergovisavi
23a2f5b38c
Fixes runtimes generated by the pai mob when it tries to click on things
2014-02-11 18:15:25 -08:00
Cheridan
6b26c4f656
OOPS
2014-02-11 13:14:04 -06:00
fleure
c2f5e92c0a
Merge pull request #2687 from optimumtact/autolathe_add_syringe
...
Add's syringes to the autolathe, 20 glass, 10 metal cost
2014-02-11 18:01:04 +00:00
