Commit Graph

6028 Commits

Author SHA1 Message Date
Cheridan b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys
Fixes some awful defines to not be hacks
2016-01-24 21:15:14 -06:00
duncathan salt 0d5885a1f0 Merge pull request #14819 from KorPhaeron/polymorph
Polymorph Fixes
2016-01-24 13:08:11 -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
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
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 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
KorPhaeron 43fd76b7d4 Forgot to update the check 2016-01-23 13:43:52 -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
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
MrPerson e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08: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
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
tkdrg c26a9488d4 Merge pull request #14762 from AnturK/botradiofix
Fixes Pingsky Radio
2016-01-22 21:34:17 -03:00
Remie Richards 6df21ac81f Merge pull request #14764 from ChangelingRain/slimeconsume
Slimes can no longer feed on simple animals that are immune to clone and toxin damage
2016-01-23 00:28:29 +00:00
xxalpha 32947c4cec Changed it so bots are all on the mob layer. 2016-01-23 00:15:13 +00:00
AnturK 12b9993b0a Fixes mindswapping into AI 2016-01-22 23:41:47 +01:00
Nerd Lord dc6ecbe8f3 missed one 2016-01-20 15:51:33 -05:00
Nerd Lord cd249d41f3 Slimes can no longer feed on simple animals that are immune to clone and toxin damage
Simple animal damage procs return the damage done(as one would expect)
2016-01-20 15:38:58 -05:00
Menshin f5b619147a Fixes lag on new player login. 2016-01-20 19:50:46 +01:00
AnturK b879d40f04 Fixes Pingsky Radio 2016-01-20 16:39:57 +01:00
duncathan salt 7ea17e7925 Merge pull request #14743 from neersighted/mo_tguis
tgui: fix-22
2016-01-19 23:40:04 -06:00
xxalpha 346c698162 conflict fix
FORWARD SLASH
2016-01-19 23:06:23 +00:00
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
xxalpha aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
duncathan salt 410885e609 Merge pull request #14709 from xxalpha/thiswasalreadyfixed
jump to area uses safepick
2016-01-19 07:26:33 -06:00
duncathan salt f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
KorPhaeron 52ea5c5c63 Ranged Guardian 2016-01-18 22:09:00 -06:00
Razharas 6143894aae Merge pull request #14704 from AnturK/jetpacksareforlosers
Fixes simple syndicates space move
2016-01-19 03:48:31 +03:00
Razharas 9e1923cc52 Merge pull request #14694 from xxalpha/zhe
Fixes covering clothing not hiding gender on examine()
2016-01-19 03:46:35 +03:00
Razharas 3020846f97 Merge pull request #14692 from AnturK/rollforfixes
Random Fixes
2016-01-19 03:45:43 +03:00
duncathan salt 118af31dc3 Merge pull request #14699 from Razharas/GibFix
Fixes ling armour being ungibbable
2016-01-18 18:31:14 -06:00
Bjorn Neergaard 09aff20b6f Hotfix for MULEs 2016-01-18 16:26:18 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
xxalpha 9a9aaabb8d Removed bot/Emag() proc. Silicons can't interface with human emagged bots. 2016-01-18 19:12:19 +00:00
xxalpha 577488e0d8 safepick
more safepick
2016-01-18 05:46:44 +00:00
xxalpha 53b74da4bd Fixes the straightjacket
More straightfixes
2016-01-17 22:12:34 +00:00
AnturK a39de9eb6d Fixes simple syndicates space move 2016-01-17 22:47:42 +01:00
tkdrg 0ba3fdc3f2 Merge pull request #14675 from Razharas/BloodFix
Makes some species disease immune
2016-01-17 18:45:45 -03:00
Razharas 21d62df0c6 Fixes ling armour being ungibbable
Fixes ling armour being ungibbable
Fixes https://github.com/tgstation/-tg-station/issues/11388
2016-01-17 20:37:04 +03:00
xxalpha 0189be9519 Fixed covering clothing not hiding gender on examine(). 2016-01-17 15:57:46 +00:00
tkdrg 6fab2e82d8 Merge pull request #14662 from MrStonedOne/patch-127
Fixes control click to unpull not working with turfs.
2016-01-17 11:57:55 -03:00