Commit Graph

13263 Commits

Author SHA1 Message Date
KazeEspada 17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada b774041648 Lizards now hunt and kill insects, they swallow them whole.
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
Iamgoofball d18710442c cryostal/pyro no longer reacts in NOREACT beakers
final freeze
2016-01-24 12:23:04 -08:00
duncathan salt 812aa0555a Merge pull request #14824 from tkdrg/teh_gooey
Adds Keycard Authentication tgui
2016-01-24 13:58:51 -06:00
duncathan salt f56eec60fb Merge pull request #14809 from tkdrg/hurr_bugexploitingisfun
[s]Fixes RPD/disposals exploits
2016-01-24 13:43:41 -06:00
Tkdrg cc4bd69228 Adds Keycard Authentication tgui
Also rewrites keycard authentication because they were awful.
2016-01-24 16:29:36 -03:00
Tkdrg 773f0f7c21 Fixes RPD/disposals exploits
Also removes a bit of copy-paste and speeds up a helper slightly.

Fixes #13473
Fixes #14654
2016-01-24 16:23:20 -03:00
duncathan salt 11942d5c6d Merge pull request #14822 from AnturK/fixornofix
Fixes standard wish granter.
2016-01-24 13:08:35 -06:00
duncathan salt 0d5885a1f0 Merge pull request #14819 from KorPhaeron/polymorph
Polymorph Fixes
2016-01-24 13:08:11 -06:00
duncathan salt 2f526076c3 Merge pull request #14818 from KorPhaeron/halt_halt_halt
Fixes deaf people hearing sec hailers
2016-01-24 13:07:56 -06:00
duncathan salt 5e8f4a7679 Merge pull request #14734 from KorPhaeron/night_vision
Fixes ranged guardian light
2016-01-24 13:06:10 -06:00
tkdrg dc0e8f7b5c Merge pull request #14817 from duncathan/lastmos
Adds mapping freedom to the TEG
2016-01-24 15:15:48 -03:00
duncathan salt 10788ec515 Merge pull request #14785 from AnturK/aicardgui
Adds AI card tgui
2016-01-24 10:53:34 -06:00
tkdrg 0f6bb2d0dc Merge pull request #14723 from AnturK/notsorandomfixes
Fixes
2016-01-24 13:46:42 -03:00
tkdrg b8ecaa07ea Merge pull request #14791 from AnturK/mindswapfixes
Mindswap fixes
2016-01-24 13:31:51 -03:00
tkdrg 016396b78e Merge pull request #14810 from tgstation/duncathan-patch-1
Fixes whiplash from shuttle docking while buckled
2016-01-24 13:31:10 -03:00
duncathan salt 14befdc1e8 Merge pull request #14807 from Razharas/UltimateFix
For real fixes smeses charge on construction
2016-01-24 10:07:00 -06:00
Razharas b9eacbaf4a Merge pull request #14794 from ChangelingRain/superbombing
Fixes supermatter explosion being capped
2016-01-24 16:54:40 +03:00
tkdrg 056e5636b2 Merge pull request #14792 from KorPhaeron/helmet
Fixes hardsuit helmet noise spam
2016-01-24 09:08:43 -03:00
AnturK d2be78ab6c Refactors renaming a bit 2016-01-24 12:56:50 +01:00
AnturK 330684df11 Fixes constructed AI's not getting their preferred name 2016-01-24 12:56:03 +01:00
AnturK 229724a6e7 Fixes medbeam pass flags 2016-01-24 12:56:02 +01:00
AnturK 9e8eca56a7 Adds AI card tgui
Removes the multiple AI's on one card semi feature.
2016-01-24 12:52:31 +01:00
Razharas 42cb52d9e2 Merge pull request #14793 from xxalpha/foamistransparent
Make foam transparent and cover everything including mobs.
2016-01-24 07:26:11 +03:00
Bjorn Neergaard 5b3db3b6f7 Fix uplinks including items they should not in surplus crates 2016-01-23 18:56:37 -06:00
Bjorn Neergaard 3f5f833013 Fix pizzabomb icon bug 2016-01-23 18:56:35 -06:00
AnturK a44f985566 Fixes dark wishgranter not killing faithless properly 2016-01-23 21:50:53 +01:00
KorPhaeron 43fd76b7d4 Forgot to update the check 2016-01-23 13:43:52 -06:00
duncathan salt 0d1f90ff54 Merge pull request #14784 from Razharas/FlashVoiceFix
Fixes flashes and voice analyzers
2016-01-23 13:40:44 -06:00
duncathan 143352e506 fucking birdboat 2016-01-23 13:14:07 -06:00
KorPhaeron 19084954ab Proper night vision toggle 2016-01-23 13:13:29 -06:00
KorPhaeron 45e541146b Drone fix 2016-01-23 13:07:52 -06:00
KorPhaeron f76d8567c7 Polymorph 2016-01-23 13:03:21 -06:00
KorPhaeron 2cb4b85b4a Fixes hailer 2016-01-23 12:34:01 -06:00
duncathan 07bb3775e6 adds mapping freedom to the TEG 2016-01-23 12:25:42 -06:00
duncathan salt f92066b478 Fixes whiplash from shuttle docking while buckled 2016-01-23 09:55:23 -06:00
Carl Ivanov 89f9556b26 Fix 2016-01-24 00:39:13 +09:00
bear1ake 6972a21830 Fix for #14804
Thanks to phil235
2016-01-24 00:22:57 +09:00
Razharas d6ddcf6b4c For real fixes smeses charge on construction
For real fixes smeses charge on construction
Fixes https://github.com/tgstation/-tg-station/issues/14806
2016-01-23 18:17:01 +03:00
Remie Richards 3cb348c477 Merge pull request #14761 from neersighted/tgui
tgui wires; refactor wire datums; more to come
2016-01-23 02:24:34 +00:00
Bjorn Neergaard 7c7d35f204 Fix colon cancer 2016-01-22 20:18:01 -06:00
Bjorn Neergaard 1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard 4224c800f0 Rewrite cryo
Similar balance but now healing is all in the reagent; and code is much simplified
Remove cryo leaking air, it just consumes O2 now. Gasses with a higher
specific_heat can be used to improve efficiency.
Greatly buffs cryo upgrades, in return for slight decrease in un-upgraded
performance due to atmos simulation.

Fix canister relabeling icons (Fixes #14742)

Add wrench sound to portable_atmospherics (consistency with ATMOSPHERICS/components)

Fix blood directly setting oxyloss (now uses adjustOxyLoss, balanced to be ~same as before)
2016-01-22 19:25:34 -06:00
Bjorn Neergaard b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
tkdrg 655bec0590 Merge pull request #14775 from octareenroon91/patch-34
Enforce Consistency in Chem Machinery
2016-01-22 22:23:17 -03:00
Bjorn Neergaard 09571bd45f Allow custom pizzas in pizza boxes
Also fix boxes icons being wrong after surviving an explosion
2016-01-22 19:22:12 -06:00
Bjorn Neergaard 92f0df219b Don't send duplicate JSON down the wire 2016-01-22 19:22:11 -06:00
Bjorn Neergaard 99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
Bjorn Neergaard 87b0857b93 Refactor wire datums
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
AnturK cda2f26d56 tgui wires initial 2016-01-22 19:13:23 -06:00